diff --git a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java
index 2f072f25f18..95a6f23aa2e 100644
--- a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java
+++ b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java
@@ -583,7 +583,7 @@ public boolean process(Request request, Response response, Callback callback)
         }
 
         // tag::handlerFilter[]
-        class FilterHandler extends Handler.BaseWrapper
+        class FilterHandler extends Handler.Wrapper
         {
             @Override
             public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyHandlerTest.java b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyHandlerTest.java
index bf74ec2e5a2..b636c74768d 100644
--- a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyHandlerTest.java
+++ b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyHandlerTest.java
@@ -208,7 +208,7 @@ public boolean process(Request request, Response response, Callback callback)
         fcgiHandler.setOriginalQueryAttribute(queryAttribute);
 
         proxyContext.stop();
-        proxyContext.insertHandler(new Handler.BaseWrapper()
+        proxyContext.insertHandler(new Handler.Wrapper()
         {
             @Override
             public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java b/jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java
index de3583ccb95..6b22ddf7f5d 100644
--- a/jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java
+++ b/jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java
@@ -37,7 +37,7 @@
  * {@link PatternRule} subclasses), via regular expression matching (using
  * {@link RegexRule} subclasses), or by a custom implementation of {@code Rule}.</p>
  */
-public class RewriteHandler extends Handler.BaseWrapper
+public class RewriteHandler extends Handler.Wrapper
 {
     private final RuleContainer _rules;
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
index 6b717219bdc..8eff30cb57e 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
@@ -226,7 +226,7 @@ static void setAsParent(Container parent, Handler handler)
         {
             if (parent instanceof Collection collection)
                 collection.addHandler(handler);
-            else if (parent instanceof Wrapper wrapper)
+            else if (parent instanceof Singleton wrapper)
                 wrapper.setHandler(handler);
             else if (parent != null)
                 throw new IllegalArgumentException("Unknown parent type: " + parent);
@@ -256,16 +256,18 @@ default void setHandlers(Handler... handlers)
 
     /**
      * <p>A {@link Handler.Container} that can contain a single other {@code Handler}.</p>
-     * @see BaseWrapper for an implementation of {@link Wrapper}.
+     * <p>This is "singleton" in the sense of {@link Collections#singleton(Object)} and not
+     * in the sense of the singleton pattern of a single instance per JVM.</p>
+     * @see Wrapper for an implementation of {@link Singleton}.
      */
-    interface Wrapper extends Container
+    interface Singleton extends Container
     {
         Handler getHandler();
 
         /**
          * Set the nested handler.
          * Implementations should check for loops, set the server and update any {@link ContainerLifeCycle} beans, all
-         * of which can be done by using the utility method {@link #updateHandler(Wrapper, Handler)}
+         * of which can be done by using the utility method {@link #updateHandler(Singleton, Handler)}
          * @param handler The handler to set.
          */
         void setHandler(Handler handler);
@@ -286,12 +288,12 @@ default List<Handler> getHandlers()
             return (next == null) ? Collections.emptyList() : Collections.singletonList(next);
         }
 
-        default void insertHandler(Wrapper handler)
+        default void insertHandler(Singleton handler)
         {
-            Wrapper tail = handler;
-            while (tail.getHandler() instanceof BaseWrapper)
+            Singleton tail = handler;
+            while (tail.getHandler() instanceof Wrapper)
             {
-                tail = (BaseWrapper)tail.getHandler();
+                tail = (Wrapper)tail.getHandler();
             }
             if (tail.getHandler() != null)
                 throw new IllegalArgumentException("bad tail of inserted wrapper chain");
@@ -301,12 +303,12 @@ default void insertHandler(Wrapper handler)
         }
 
         /**
-         * @return The tail {@link Wrapper} of a chain of {@link Wrapper}s
+         * @return The tail {@link Singleton} of a chain of {@link Singleton}s
          */
-        default Wrapper getTail()
+        default Singleton getTail()
         {
-            Wrapper tail = this;
-            while (tail.getHandler() instanceof Wrapper wrapped)
+            Singleton tail = this;
+            while (tail.getHandler() instanceof Singleton wrapped)
                 tail = wrapped;
             return tail;
         }
@@ -322,7 +324,7 @@ default Wrapper getTail()
          * @param handler The handle to set
          * @return The set handler.
          */
-        static Handler updateHandler(Wrapper wrapper, Handler handler)
+        static Handler updateHandler(Singleton wrapper, Handler handler)
         {
             // check state
             Server server = wrapper.getServer();
@@ -561,31 +563,31 @@ public static <T extends Handler.Container> T findContainerOf(Handler.Container
     }
 
     /**
-     * An implementation of {@link Wrapper}, which is a {@link Handler.Container} that wraps a single other {@link Handler}.
+     * An implementation of {@link Singleton}, which is a {@link Handler.Container} that wraps a single other {@link Handler}.
      */
-    class BaseWrapper extends AbstractContainer implements Wrapper
+    class Wrapper extends AbstractContainer implements Singleton
     {
         private Handler _handler;
 
-        public BaseWrapper()
+        public Wrapper()
         {
             this(null);
         }
 
-        public BaseWrapper(boolean dynamic)
+        public Wrapper(boolean dynamic)
         {
             this(dynamic, null);
         }
 
-        public BaseWrapper(Handler handler)
+        public Wrapper(Handler handler)
         {
             this(false, handler);
         }
 
-        public BaseWrapper(boolean dynamic, Handler handler)
+        public Wrapper(boolean dynamic, Handler handler)
         {
             super(dynamic);
-            _handler = handler == null ? null : Wrapper.updateHandler(this, handler);
+            _handler = handler == null ? null : Singleton.updateHandler(this, handler);
         }
 
         @Override
@@ -599,7 +601,7 @@ public void setHandler(Handler handler)
         {
             if (!isDynamic() && isStarted())
                 throw new IllegalStateException(getState());
-            _handler = Wrapper.updateHandler(this, handler);
+            _handler = Singleton.updateHandler(this, handler);
         }
 
         @Override
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index 97213dab5a5..760717aa98a 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -68,7 +68,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Server extends Handler.BaseWrapper implements Attributes
+public class Server extends Handler.Wrapper implements Attributes
 {
     private static final Logger LOG = LoggerFactory.getLogger(Server.class);
     private static final String __serverInfo = "jetty/" + Server.getVersion();
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractLatencyRecordingHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractLatencyRecordingHandler.java
index 11de8703b59..6f177859a84 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractLatencyRecordingHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractLatencyRecordingHandler.java
@@ -28,7 +28,7 @@
  * (obtained from {@link HttpStream#getNanoTime()}) until the stream completion event has been handled by
  * {@link HttpStream#succeeded()} or {@link HttpStream#failed(Throwable)}.</p>
  */
-public abstract class AbstractLatencyRecordingHandler extends Handler.BaseWrapper
+public abstract class AbstractLatencyRecordingHandler extends Handler.Wrapper
 {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractLatencyRecordingHandler.class);
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java
index 6fe3407b7f2..9357b1a935f 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java
@@ -53,7 +53,7 @@
  * generated can also be unbounded.
  * </p>
  */
-public class BufferedResponseHandler extends Handler.BaseWrapper
+public class BufferedResponseHandler extends Handler.Wrapper
 {
     public static final String BUFFER_SIZE_ATTRIBUTE_NAME = BufferedResponseHandler.class.getName() + ".buffer-size";
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
index 8e19b29b93e..7c207e2d583 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
@@ -55,7 +55,7 @@
 /**
  * <p>Implementation of a {@link Handler} that supports HTTP CONNECT.</p>
  */
-public class ConnectHandler extends Handler.BaseWrapper
+public class ConnectHandler extends Handler.Wrapper
 {
     private static final Logger LOG = LoggerFactory.getLogger(ConnectHandler.class);
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
index ef207ed3fbb..9cf07b29013 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -63,7 +63,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ContextHandler extends Handler.BaseWrapper implements Attributes, Graceful, AliasCheck
+public class ContextHandler extends Handler.Wrapper implements Attributes, Graceful, AliasCheck
 {
     // TODO where should the alias checking go?
     // TODO add protected paths to ServletContextHandler?
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java
index 6416a45cec9..95480e8b4e7 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java
@@ -35,7 +35,7 @@
  * and the current thread name is updated with information that will link
  * to the details in that output.
  */
-public class DebugHandler extends Handler.BaseWrapper implements Connection.Listener
+public class DebugHandler extends Handler.Wrapper implements Connection.Listener
 {
     private final DateCache _date = new DateCache("HH:mm:ss", Locale.US);
     private OutputStream _out;
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java
index eea3aeb4a53..73f9cb5c9c2 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java
@@ -36,7 +36,7 @@
 import org.eclipse.jetty.util.Fields;
 import org.eclipse.jetty.util.StringUtil;
 
-public class DelayedHandler extends Handler.BaseWrapper
+public class DelayedHandler extends Handler.Wrapper
 {
     @Override
     public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GracefulHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GracefulHandler.java
index 448456a6534..7bdf55f0f5b 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GracefulHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GracefulHandler.java
@@ -28,7 +28,7 @@
 /**
  * Handler to track active requests and allow them to gracefully complete.
  */
-public class GracefulHandler extends Handler.BaseWrapper implements Graceful
+public class GracefulHandler extends Handler.Wrapper implements Graceful
 {
     private static final Logger LOG = LoggerFactory.getLogger(GracefulHandler.class);
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java
index f10cf2d514a..a695849aa1d 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java
@@ -23,7 +23,7 @@
 /**
  * A <code>HandlerContainer</code> that allows a hot swap of a wrapped handler.
  */
-public class HotSwapHandler extends Handler.AbstractContainer implements Handler.Wrapper
+public class HotSwapHandler extends Handler.AbstractContainer implements Handler.Singleton
 {
     // TODO unit tests
 
@@ -51,7 +51,7 @@ public Handler getHandler()
     public void setHandler(Handler handler)
     {
         // check state
-        Server server1 = ((Wrapper)this).getServer();
+        Server server1 = ((Singleton)this).getServer();
         if (server1 != null && server1.isStarted() && handler != null &&
             server1.getInvocationType() != Invocable.combine(server1.getInvocationType(), handler.getInvocationType()))
             throw new IllegalArgumentException("Cannot change invocation type of started server");
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java
index 516e9f7c131..a9c08390430 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java
@@ -31,7 +31,7 @@
  *   &lt;/Set&gt;
  * </pre>
  */
-public class IdleTimeoutHandler extends Handler.BaseWrapper
+public class IdleTimeoutHandler extends Handler.Wrapper
 {
     private long _idleTimeoutMs = 1000;
     private boolean _applyToAsync = false;
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java
index d0f2036f9dd..bee5e661154 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java
@@ -41,7 +41,7 @@
  * the forwarded for headers, as this cannot be as easily forged.
  * </p>
  */
-public class InetAccessHandler extends Handler.BaseWrapper
+public class InetAccessHandler extends Handler.Wrapper
 {
     // TODO replace this handler with a general conditional handler wrapper.
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxiedRequestHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxiedRequestHandler.java
index 76962ad65b0..60d8954901b 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxiedRequestHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxiedRequestHandler.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.HostPort;
 
-public class ProxiedRequestHandler extends Handler.BaseWrapper
+public class ProxiedRequestHandler extends Handler.Wrapper
 {
     @Override
     public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
index c54120f4f2f..472d092b6e1 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
@@ -53,7 +53,7 @@
  *  - request ranges
  *  - a way to configure caching or not
  */
-public class ResourceHandler extends Handler.BaseWrapper
+public class ResourceHandler extends Handler.Wrapper
 {
     private final ResourceService _resourceService;
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/SecuredRedirectHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/SecuredRedirectHandler.java
index 332bb024286..241552385eb 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/SecuredRedirectHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/SecuredRedirectHandler.java
@@ -35,7 +35,7 @@
  * {@link HttpConfiguration#getSecurePort()}
  * </p>
  */
-public class SecuredRedirectHandler extends Handler.BaseWrapper
+public class SecuredRedirectHandler extends Handler.Wrapper
 {
     /**
      * The redirect code to send in response.
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java
index 6cb25b3d981..c2ea3d1ecb5 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java
@@ -76,7 +76,7 @@
  * }
  * }</pre>
  */
-public class ShutdownHandler extends Handler.BaseWrapper
+public class ShutdownHandler extends Handler.Wrapper
 {
     private static final Logger LOG = LoggerFactory.getLogger(ShutdownHandler.class);
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
index a4b5dc45ef9..9005b403604 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
@@ -37,7 +37,7 @@
 import org.eclipse.jetty.util.statistic.CounterStatistic;
 import org.eclipse.jetty.util.statistic.SampleStatistic;
 
-public class StatisticsHandler extends Handler.BaseWrapper
+public class StatisticsHandler extends Handler.Wrapper
 {
     private final Set<String> _connectionStats = ConcurrentHashMap.newKeySet();
     private final CounterStatistic _requestStats = new CounterStatistic();
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java
index 4f0e9de7c91..9109460be03 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java
@@ -67,7 +67,7 @@
  * a thread is available.
  * <p>This is a simpler alternative to DosFilter</p>
  */
-public class ThreadLimitHandler extends Handler.BaseWrapper
+public class ThreadLimitHandler extends Handler.Wrapper
 {
     private static final Logger LOG = LoggerFactory.getLogger(ThreadLimitHandler.class);
 
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/TryPathsHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/TryPathsHandler.java
index 77637764df7..d0b8c0e8875 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/TryPathsHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/TryPathsHandler.java
@@ -65,7 +65,7 @@
  * under the names specified by {@link #setOriginalPathAttribute(String)}
  * and {@link #setOriginalQueryAttribute(String)}.</p>
  */
-public class TryPathsHandler extends Handler.BaseWrapper
+public class TryPathsHandler extends Handler.Wrapper
 {
     private String originalPathAttribute;
     private String originalQueryAttribute;
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
index 3d354386b32..2cdd1312d44 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
@@ -37,7 +37,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class GzipHandler extends Handler.BaseWrapper implements GzipFactory
+public class GzipHandler extends Handler.Wrapper implements GzipFactory
 {
     public static final String GZIP_HANDLER_ETAGS = "o.e.j.s.h.gzip.GzipHandler.etag";
     public static final String GZIP = "gzip";
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
index 7b5478131c5..d6ee4951b95 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
@@ -1825,7 +1825,7 @@ public Content.Chunk read()
     public void testProcessingAfterCompletion() throws Exception
     {
         AtomicReference<String> result = new AtomicReference<>();
-        Handler.Wrapper wrapper = new Handler.BaseWrapper()
+        Handler.Singleton wrapper = new Handler.Wrapper()
         {
             @Override
             public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java
index abfdf3c4afa..8c435c3f225 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java
@@ -320,7 +320,7 @@ public void testFindContainer()
 
         ContextHandler contextB = new ContextHandler("/b");
         IsHandledHandler handlerB = new IsHandledHandler("B");
-        Handler.Wrapper wrapperB = new Handler.BaseWrapper();
+        Handler.Singleton wrapperB = new Handler.Wrapper();
         wrapperB.setHandler(handlerB);
         contextB.setHandler(wrapperB);
 
@@ -334,16 +334,16 @@ public void testFindContainer()
         collection.addHandler(contextB);
         collection.addHandler(contextC);
 
-        Handler.Wrapper wrapper = new Handler.BaseWrapper();
+        Handler.Singleton wrapper = new Handler.Wrapper();
         wrapper.setHandler(collection);
         server.setHandler(wrapper);
 
-        assertEquals(wrapper, Handler.AbstractContainer.findContainerOf(server, Handler.BaseWrapper.class, handlerA));
+        assertEquals(wrapper, Handler.AbstractContainer.findContainerOf(server, Handler.Wrapper.class, handlerA));
         assertEquals(contextA, Handler.AbstractContainer.findContainerOf(server, ContextHandler.class, handlerA));
         assertEquals(contextB, Handler.AbstractContainer.findContainerOf(server, ContextHandler.class, handlerB));
-        assertEquals(wrapper, Handler.AbstractContainer.findContainerOf(server, Handler.BaseWrapper.class, handlerB));
-        assertEquals(contextB, Handler.AbstractContainer.findContainerOf(collection, Handler.BaseWrapper.class, handlerB));
-        assertEquals(wrapperB, Handler.AbstractContainer.findContainerOf(contextB, Handler.BaseWrapper.class, handlerB));
+        assertEquals(wrapper, Handler.AbstractContainer.findContainerOf(server, Handler.Wrapper.class, handlerB));
+        assertEquals(contextB, Handler.AbstractContainer.findContainerOf(collection, Handler.Wrapper.class, handlerB));
+        assertEquals(wrapperB, Handler.AbstractContainer.findContainerOf(contextB, Handler.Wrapper.class, handlerB));
     }
 
     @Test
@@ -407,7 +407,7 @@ public void testWrappedContext() throws Exception
         assertThat(response, containsString("Wrapped: right"));
     }
 
-    private static final class WrappedHandler extends Handler.BaseWrapper
+    private static final class WrappedHandler extends Handler.Wrapper
     {
         private final String tag;
 
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java
index b1dd72df2fc..d2171baf57d 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java
@@ -658,7 +658,7 @@ public void testSetHandlerLoopSelf()
     public void testSetHandlerLoopDeepWrapper()
     {
         ContextHandler contextHandlerA = new ContextHandler();
-        Handler.Wrapper handlerWrapper = new Handler.BaseWrapper();
+        Handler.Singleton handlerWrapper = new Handler.Wrapper();
         contextHandlerA.setHandler(handlerWrapper);
         assertThrows(IllegalStateException.class, () -> handlerWrapper.setHandler(contextHandlerA));
     }
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/HandlerTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/HandlerTest.java
index 5672e7e6e55..97e34468bb4 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/HandlerTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/HandlerTest.java
@@ -38,9 +38,9 @@ public class HandlerTest
     public void testWrapperSetServer()
     {
         Server s = new Server();
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
-        Handler.Wrapper c = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
+        Handler.Singleton c = new Handler.Wrapper();
         a.setHandler(b);
         b.setHandler(c);
 
@@ -53,9 +53,9 @@ public void testWrapperSetServer()
     public void testWrapperServerSet()
     {
         Server s = new Server();
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
-        Handler.Wrapper c = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
+        Handler.Singleton c = new Handler.Wrapper();
         a.setServer(s);
         b.setHandler(c);
         a.setHandler(b);
@@ -67,7 +67,7 @@ public void testWrapperServerSet()
     @Test
     public void testWrapperThisLoop()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
 
         IllegalStateException e = assertThrows(IllegalStateException.class, () -> a.setHandler(a));
         assertThat(e.getMessage(), containsString("loop"));
@@ -76,8 +76,8 @@ public void testWrapperThisLoop()
     @Test
     public void testWrapperSimpleLoop()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
 
         a.setHandler(b);
 
@@ -88,9 +88,9 @@ public void testWrapperSimpleLoop()
     @Test
     public void testWrapperDeepLoop()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
-        Handler.Wrapper c = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
+        Handler.Singleton c = new Handler.Wrapper();
 
         a.setHandler(b);
         b.setHandler(c);
@@ -102,9 +102,9 @@ public void testWrapperDeepLoop()
     @Test
     public void testWrapperChainLoop()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
-        Handler.Wrapper c = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
+        Handler.Singleton c = new Handler.Wrapper();
 
         a.setHandler(b);
         c.setHandler(a);
@@ -217,8 +217,8 @@ public void testHandlerCollectionChainLoop()
     @Test
     public void testInsertWrapperTail()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
 
         a.insertHandler(b);
         assertThat(a.getHandler(), equalTo(b));
@@ -228,9 +228,9 @@ public void testInsertWrapperTail()
     @Test
     public void testInsertWrapper()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
-        Handler.Wrapper c = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
+        Handler.Singleton c = new Handler.Wrapper();
 
         a.insertHandler(c);
         a.insertHandler(b);
@@ -242,10 +242,10 @@ public void testInsertWrapper()
     @Test
     public void testInsertWrapperChain()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
-        Handler.Wrapper c = new Handler.BaseWrapper();
-        Handler.Wrapper d = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
+        Handler.Singleton c = new Handler.Wrapper();
+        Handler.Singleton d = new Handler.Wrapper();
 
         a.insertHandler(d);
         b.insertHandler(c);
@@ -259,10 +259,10 @@ public void testInsertWrapperChain()
     @Test
     public void testInsertWrapperBadChain()
     {
-        Handler.Wrapper a = new Handler.BaseWrapper();
-        Handler.Wrapper b = new Handler.BaseWrapper();
-        Handler.Wrapper c = new Handler.BaseWrapper();
-        Handler.Wrapper d = new Handler.BaseWrapper();
+        Handler.Singleton a = new Handler.Wrapper();
+        Handler.Singleton b = new Handler.Wrapper();
+        Handler.Singleton c = new Handler.Wrapper();
+        Handler.Singleton d = new Handler.Wrapper();
 
         a.insertHandler(d);
         b.insertHandler(c);
@@ -282,7 +282,7 @@ public boolean process(Request request, Response response, Callback callback)
     @Test
     public void testSetServerPropagation()
     {
-        Handler.Wrapper wrapper = new Handler.BaseWrapper();
+        Handler.Singleton wrapper = new Handler.Wrapper();
         Handler.Sequence collection = new Handler.Sequence();
         Handler handler = new Handler.Abstract()
         {
@@ -305,7 +305,7 @@ public boolean process(Request request, Response response, Callback callback) th
     @Test
     public void testSetHandlerServerPropagation()
     {
-        Handler.Wrapper wrapper = new Handler.BaseWrapper();
+        Handler.Singleton wrapper = new Handler.Wrapper();
         Handler.Sequence collection = new Handler.Sequence();
         Handler handler = new Handler.Abstract()
         {
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/PathMappingsHandlerTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/PathMappingsHandlerTest.java
index 59ebecb1b21..550dc794b83 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/PathMappingsHandlerTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/PathMappingsHandlerTest.java
@@ -218,7 +218,7 @@ public void testGetDescendantsDeep()
 
         Handler.Sequence sequence = new Handler.Sequence();
         sequence.addHandler(new SimpleHandler("phpIndex"));
-        Handler.Wrapper handlerWrapper = new Handler.BaseWrapper(new SimpleHandler("other"));
+        Handler.Singleton handlerWrapper = new Handler.Wrapper(new SimpleHandler("other"));
         sequence.addHandler(handlerWrapper);
 
         PathMappingsHandler pathMappingsHandler = new PathMappingsHandler();
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java
index 8009d3ae543..29dc30cca76 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java
@@ -71,7 +71,7 @@ public void testShutdownServerWithCorrectTokenAndFromLocalhost(String shutdownTo
         shutdownHandler.setHandler(new EchoHandler());
 
         InetSocketAddress fakeRemoteAddr = new InetSocketAddress("127.0.0.1", 22033);
-        Handler.Wrapper fakeRemoteAddressHandler = new FakeRemoteAddressHandlerWrapper(fakeRemoteAddr);
+        Handler.Singleton fakeRemoteAddressHandler = new FakeRemoteAddressHandlerWrapper(fakeRemoteAddr);
         fakeRemoteAddressHandler.setHandler(shutdownHandler);
 
         createServer(fakeRemoteAddressHandler);
@@ -119,7 +119,7 @@ public void testShutdownRequestNotFromLocalhost() throws Exception
         shutdownHandler.setHandler(new EchoHandler());
 
         InetSocketAddress fakeRemoteAddr = new InetSocketAddress("192.168.0.1", 12345);
-        Handler.Wrapper fakeRemoteAddressHandler = new FakeRemoteAddressHandlerWrapper(fakeRemoteAddr);
+        Handler.Singleton fakeRemoteAddressHandler = new FakeRemoteAddressHandlerWrapper(fakeRemoteAddr);
         fakeRemoteAddressHandler.setHandler(shutdownHandler);
 
         createServer(fakeRemoteAddressHandler);
@@ -155,7 +155,7 @@ private HttpTester.Response sendShutdownRequest(String shutdownToken) throws Exc
         }
     }
 
-    static class FakeRemoteAddressHandlerWrapper extends Handler.BaseWrapper
+    static class FakeRemoteAddressHandlerWrapper extends Handler.Wrapper
     {
         private final InetSocketAddress fakeRemoteAddress;
 
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java
index 66bff598374..7b565c9dc82 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java
@@ -743,7 +743,7 @@ public boolean process(Request request, Response response, Callback callback) th
     // This handler is external to the statistics handler and it is used to ensure that statistics handler's
     // handle() is fully executed before asserting its values in the tests, to avoid race conditions with the
     // tests' code where the test executes but the statistics handler has not finished yet.
-    private static class LatchHandler extends Handler.BaseWrapper
+    private static class LatchHandler extends Handler.Wrapper
     {
         private volatile CountDownLatch _latch = new CountDownLatch(1);
 
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipHandlerTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipHandlerTest.java
index ce908641a0d..6d7c6198cbf 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipHandlerTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipHandlerTest.java
@@ -1999,7 +1999,7 @@ public static class UncompressedMetadata
         public int uncompressedSize;
     }
 
-    public static class CheckHandler extends Handler.BaseWrapper
+    public static class CheckHandler extends Handler.Wrapper
     {
         @Override
         public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java
index afbf36fe051..a8fdc637206 100644
--- a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java
@@ -97,7 +97,7 @@ private void start(BiConsumer<SslContextFactory.Server, SecureRequestCustomizer>
         SecureRequestCustomizer secureRequestCustomizer = new SecureRequestCustomizer();
         httpConfiguration.addCustomizer(secureRequestCustomizer);
 
-        Handler.Wrapper xCertHandler = new Handler.BaseWrapper()
+        Handler.Singleton xCertHandler = new Handler.Wrapper()
         {
             @Override
             public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SimpleSessionHandler.java b/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SimpleSessionHandler.java
index dd3686bbf2c..6a771b336e9 100644
--- a/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SimpleSessionHandler.java
+++ b/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SimpleSessionHandler.java
@@ -27,7 +27,7 @@
 /**
  * SimpleSessionHandler example
  */
-public class SimpleSessionHandler extends AbstractSessionManager implements Handler.Wrapper
+public class SimpleSessionHandler extends AbstractSessionManager implements Handler.Singleton
 {
     private Server _server;
     private Handler _handler;
@@ -47,7 +47,7 @@ public Handler getHandler()
     @Override
     public void setHandler(Handler handler)
     {
-        _handler = Handler.Wrapper.updateHandler(this, handler);
+        _handler = Handler.Singleton.updateHandler(this, handler);
     }
 
     @Override
diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
index dad91ccb31e..4f05bf4a802 100644
--- a/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
+++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 
-public class WebSocketUpgradeHandler extends Handler.BaseWrapper
+public class WebSocketUpgradeHandler extends Handler.Wrapper
 {
     private final WebSocketMappings mappings;
     private final Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/java/org/eclipse/jetty/ee10/demos/ManyHandlers.java b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/java/org/eclipse/jetty/ee10/demos/ManyHandlers.java
index b2ac0ef35a2..456a6fa4086 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/java/org/eclipse/jetty/ee10/demos/ManyHandlers.java
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/java/org/eclipse/jetty/ee10/demos/ManyHandlers.java
@@ -48,7 +48,7 @@
  * </ul>
  * Multiple handlers may be combined with:
  * <ul>
- * <li>{@link Handler.BaseWrapper} which will nest one handler inside another. In
+ * <li>{@link Handler.Wrapper} which will nest one handler inside another. In
  * this example, the HelloHandler is nested inside a HandlerWrapper that sets
  * the greeting as a request attribute.
  * <li>{@link Handler.Sequence} which will call a collection of handlers until the
@@ -87,7 +87,7 @@ public boolean process(Request request, Response response, Callback callback) th
     /**
      * Add a request attribute, but produce no output.
      */
-    public static class WelcomeWrapHandler extends Handler.BaseWrapper
+    public static class WelcomeWrapHandler extends Handler.Wrapper
     {
         @Override
         public boolean process(Request request, Response response, Callback callback) throws Exception
@@ -104,7 +104,7 @@ public static Server createServer(int port) throws IOException
 
         // create the handlers
         Handler param = new ParamHandler();
-        Handler.Wrapper wrapper = new WelcomeWrapHandler();
+        Handler.Singleton wrapper = new WelcomeWrapHandler();
         Handler hello = new HelloHandler();
         GzipHandler gzipHandler = new GzipHandler();
         gzipHandler.setMinGzipSize(10);
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
index 6afc14ca7a6..1a075a7aea5 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
@@ -985,7 +985,7 @@ else if (handler instanceof ServletHandler)
         }
     }
 
-    private void doSetHandler(Handler.Wrapper wrapper, Handler handler)
+    private void doSetHandler(Singleton wrapper, Handler handler)
     {
         if (wrapper == this)
             super.setHandler(handler);
@@ -995,7 +995,7 @@ private void doSetHandler(Handler.Wrapper wrapper, Handler handler)
 
     private void relinkHandlers()
     {
-        Handler.Wrapper handler = this;
+        Singleton handler = this;
 
         // link session handler
         if (getSessionHandler() != null)
@@ -1003,7 +1003,7 @@ private void relinkHandlers()
             while (!(handler.getHandler() instanceof SessionHandler) &&
                 !(handler.getHandler() instanceof SecurityHandler) &&
                 !(handler.getHandler() instanceof ServletHandler) &&
-                handler.getHandler() instanceof Handler.Wrapper wrapped)
+                handler.getHandler() instanceof Singleton wrapped)
             {
                 handler = wrapped;
             }
@@ -1018,7 +1018,7 @@ private void relinkHandlers()
         {
             while (!(handler.getHandler() instanceof SecurityHandler) &&
                 !(handler.getHandler() instanceof ServletHandler) &&
-                handler.getHandler() instanceof Handler.Wrapper wrapped)
+                handler.getHandler() instanceof Singleton wrapped)
             {
                 handler = wrapped;
             }
@@ -1032,7 +1032,7 @@ private void relinkHandlers()
         if (getServletHandler() != null)
         {
             while (!(handler.getHandler() instanceof ServletHandler) &&
-                handler.getHandler() instanceof Handler.Wrapper wrapped)
+                handler.getHandler() instanceof Singleton wrapped)
             {
                 handler = wrapped;
             }
@@ -1612,7 +1612,7 @@ public void callContextDestroyed(ServletContextListener l, ServletContextEvent e
         l.contextDestroyed(e);
     }
 
-    private void replaceHandler(Handler.Wrapper handler, Handler.Wrapper replacement)
+    private void replaceHandler(Singleton handler, Singleton replacement)
     {
         if (isStarted())
             throw new IllegalStateException("STARTED");
@@ -1623,7 +1623,7 @@ private void replaceHandler(Handler.Wrapper handler, Handler.Wrapper replacement
             next = handler.getHandler();
             handler.setHandler((Handler)null);
 
-            Handler.Wrapper wrapper = this;
+            Singleton wrapper = this;
             while (wrapper != null)
             {
                 if (wrapper.getHandler() == handler)
@@ -1632,7 +1632,7 @@ private void replaceHandler(Handler.Wrapper handler, Handler.Wrapper replacement
                     break;
                 }
 
-                wrapper = (wrapper.getHandler() instanceof Handler.Wrapper wrapped) ? wrapped : null;
+                wrapper = (wrapper.getHandler() instanceof Singleton wrapped) ? wrapped : null;
             }
         }
 
@@ -1675,7 +1675,7 @@ public void setServletHandler(ServletHandler servletHandler)
      * but after any other HandlerWrappers.
      */
     @Override
-    public void insertHandler(Handler.Wrapper handler)
+    public void insertHandler(Singleton handler)
     {
         if (handler instanceof SessionHandler)
             setSessionHandler((SessionHandler)handler);
@@ -1685,13 +1685,13 @@ else if (handler instanceof ServletHandler)
             setServletHandler((ServletHandler)handler);
         else
         {
-            Handler.Wrapper tail = handler.getTail();
+            Singleton tail = handler.getTail();
             if (tail.getHandler() != null)
                 throw new IllegalArgumentException("bad tail of inserted wrapper chain");
 
             // Skip any injected handlers
-            Handler.Wrapper h = this;
-            while (h.getHandler() instanceof Handler.Wrapper wrapper)
+            Singleton h = this;
+            while (h.getHandler() instanceof Singleton wrapper)
             {
                 if (wrapper instanceof SessionHandler ||
                     wrapper instanceof SecurityHandler ||
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
index afde4f2b68c..61d41481f08 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
@@ -82,7 +82,7 @@
  * method must be called manually after start().
  */
 @ManagedObject("Servlet Handler")
-public class ServletHandler extends Handler.BaseWrapper
+public class ServletHandler extends Handler.Wrapper
 {
     private static final Logger LOG = LoggerFactory.getLogger(ServletHandler.class);
 
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/SessionHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/SessionHandler.java
index 05c97b707d9..f60c597974b 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/SessionHandler.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/SessionHandler.java
@@ -51,7 +51,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SessionHandler extends AbstractSessionManager implements Handler.Wrapper
+public class SessionHandler extends AbstractSessionManager implements Handler.Singleton
 {    
     static final Logger LOG = LoggerFactory.getLogger(SessionHandler.class);
     
@@ -93,7 +93,7 @@ public Handler getHandler()
     @Override
     public void setHandler(Handler handler)
     {
-        _handler = Wrapper.updateHandler(this, handler);
+        _handler = Handler.Singleton.updateHandler(this, handler);
     }
 
     @Override
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/SecurityHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/SecurityHandler.java
index a5a85b9caef..55186d42679 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/SecurityHandler.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/SecurityHandler.java
@@ -54,7 +54,7 @@
  * that start with "org.eclipse.jetty.security." that do not have
  * values in the SecurityHandler init parameters, are copied.
  */
-public abstract class SecurityHandler extends Handler.BaseWrapper implements Authenticator.AuthConfiguration
+public abstract class SecurityHandler extends Handler.Wrapper implements Authenticator.AuthConfiguration
 {
     private static final Logger LOG = LoggerFactory.getLogger(SecurityHandler.class);
     private static final List<Authenticator.Factory> __knownAuthenticatorFactories = new ArrayList<>();
diff --git a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ErrorPageTest.java b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ErrorPageTest.java
index 521f5716d62..bf20f2bad07 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ErrorPageTest.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ErrorPageTest.java
@@ -103,7 +103,7 @@ public void init() throws Exception
         _context.addServlet(ErrorContentTypeCharsetWriterInitializedServlet.class, "/error-mime-charset-writer/*");
         _context.addServlet(ExceptionServlet.class, "/exception-servlet");
 
-        Handler.Wrapper noopHandler = new Handler.BaseWrapper()
+        Handler.Singleton noopHandler = new Handler.Wrapper()
         {
             @Override
             public boolean process(Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java
index 70829dfab72..a98364f98e7 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java
@@ -1728,7 +1728,7 @@ public void testHandlerBeforeServletHandler() throws Exception
     {
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
 
-        Handler.Wrapper extra = new Handler.BaseWrapper();
+        Handler.Singleton extra = new Handler.Wrapper();
 
         context.getSessionHandler().insertHandler(extra);
 
@@ -1790,10 +1790,10 @@ public void testSetSecurityHandler()
         SecurityHandler securityHandler = context.getSecurityHandler();
 
         //check the handler linking order
-        Handler.Wrapper h = (Handler.Wrapper)context.getHandler();
+        Handler.Singleton h = (Handler.Singleton)context.getHandler();
         assertSame(h, sessionHandler);
 
-        h = (Handler.Wrapper)h.getHandler();
+        h = (Handler.Singleton)h.getHandler();
         assertSame(h, securityHandler);
 
         //replace the security handler
@@ -1830,10 +1830,10 @@ protected boolean checkWebResourcePermissions(String pathInContext, Request requ
         context.setSecurityHandler(myHandler);
         assertSame(myHandler, context.getSecurityHandler());
 
-        h = (Handler.Wrapper)context.getHandler();
+        h = (Handler.Singleton)context.getHandler();
         assertSame(h, sessionHandler);
 
-        h = (Handler.Wrapper)h.getHandler();
+        h = (Handler.Singleton)h.getHandler();
         assertSame(h, myHandler);
     }
 
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/java/org/eclipse/jetty/ee9/demos/ManyHandlers.java b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/java/org/eclipse/jetty/ee9/demos/ManyHandlers.java
index 3330d0dbfb9..81db227971c 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/java/org/eclipse/jetty/ee9/demos/ManyHandlers.java
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/java/org/eclipse/jetty/ee9/demos/ManyHandlers.java
@@ -44,7 +44,7 @@
  * </ul>
  * Multiple handlers may be combined with:
  * <ul>
- * <li>{@link Handler.BaseWrapper} which will nest one handler inside another. In
+ * <li>{@link Handler.Wrapper} which will nest one handler inside another. In
  * this example, the HelloHandler is nested inside a HandlerWrapper that sets
  * the greeting as a request attribute.
  * <li>{@link Handler.Sequence} which will call a collection of handlers until the
@@ -78,7 +78,7 @@ public boolean process(Request request, Response response, Callback callback) th
     /**
      * Add a request attribute, but produce no output.
      */
-    public static class WelcomeWrapHandler extends Handler.BaseWrapper
+    public static class WelcomeWrapHandler extends Handler.Wrapper
     {
         @Override
         public boolean process(Request request, Response response, Callback callback) throws Exception
@@ -98,7 +98,7 @@ public static Server createServer(int port) throws IOException
 
         // create the handlers
         Handler param = new ParamHandler();
-        Handler.Wrapper wrapper = new WelcomeWrapHandler();
+        Handler.Singleton wrapper = new WelcomeWrapHandler();
         Handler hello = new HelloHandler();
         GzipHandler gzipHandler = new GzipHandler();
         gzipHandler.setMinGzipSize(10);
diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
index 2a60b8558f8..1281db76cbb 100644
--- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
+++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
@@ -2487,9 +2487,9 @@ protected void doStop() throws Exception
         }
 
         @Override
-        public void insertHandler(Handler.Wrapper handler)
+        public void insertHandler(Singleton handler)
         {
-            Handler.Wrapper tail = handler.getTail();
+            Singleton tail = handler.getTail();
             if (tail.getHandler() != null)
                 throw new IllegalArgumentException("bad tail of inserted wrapper chain");
 
diff --git a/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/AsyncCompletionTest.java b/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/AsyncCompletionTest.java
index d23c183ad81..c9768f705d8 100644
--- a/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/AsyncCompletionTest.java
+++ b/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/AsyncCompletionTest.java
@@ -114,7 +114,7 @@ public void proceed()
     @Override
     protected void startServer(Handler handler) throws Exception
     {
-        org.eclipse.jetty.server.Handler.Wrapper terminateHandler = new org.eclipse.jetty.server.Handler.BaseWrapper()
+        org.eclipse.jetty.server.Handler.Singleton terminateHandler = new org.eclipse.jetty.server.Handler.Wrapper()
         {
             @Override
             public boolean process(org.eclipse.jetty.server.Request request, Response response, Callback callback) throws Exception
diff --git a/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java b/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java
index 07da0e89724..65ab1c3c6db 100644
--- a/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java
+++ b/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java
@@ -996,7 +996,7 @@ public void testIPv6() throws Exception
         });
         final InetSocketAddress remoteAddr = new InetSocketAddress(local, 32768);
 
-        org.eclipse.jetty.server.Handler.Wrapper handler = new org.eclipse.jetty.server.Handler.BaseWrapper()
+        org.eclipse.jetty.server.Handler.Singleton handler = new org.eclipse.jetty.server.Handler.Wrapper()
         {
             @Override
             public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception