diff --git a/jetty-client-new/pom.xml b/jetty-client/pom.xml
similarity index 100%
rename from jetty-client-new/pom.xml
rename to jetty-client/pom.xml
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/BufferingResponseListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/BufferingResponseListener.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/BufferingResponseListener.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/BufferingResponseListener.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/ByteBufferContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ByteBufferContentProvider.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/ByteBufferContentProvider.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/ByteBufferContentProvider.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpClient.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpConnection.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpContentResponse.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContentResponse.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpContentResponse.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpContentResponse.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpConversation.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConversation.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpConversation.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpConversation.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpDestination.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpExchange.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpExchange.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpReceiver.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpReceiver.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpRequest.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpRequest.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpResponse.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpResponse.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpResponseException.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponseException.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpResponseException.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponseException.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpSender.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/HttpSender.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/PathContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/PathContentProvider.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/PathContentProvider.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/PathContentProvider.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/RedirectionListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/RedirectionListener.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/RedirectionListener.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/RedirectionListener.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/StreamingResponseListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/StreamingResponseListener.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/StreamingResponseListener.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/StreamingResponseListener.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Address.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Address.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Address.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/Address.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Authentication.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Authentication.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Authentication.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/Authentication.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Connection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Connection.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Connection.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/Connection.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/ContentDecoder.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentDecoder.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/ContentDecoder.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentDecoder.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/ContentResponse.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentResponse.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/ContentResponse.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentResponse.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Destination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Destination.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Destination.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/Destination.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Request.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Request.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java
diff --git a/jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Response.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java
similarity index 100%
rename from jetty-client-new/src/main/java/org/eclipse/jetty/client/api/Response.java
rename to jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/EmptyHandler.java b/jetty-client/src/test/java/org/eclipse/jetty/client/EmptyHandler.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/EmptyHandler.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/EmptyHandler.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpClientTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpDestinationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpDestinationTest.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpDestinationTest.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/HttpDestinationTest.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/RedirectionTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/RedirectionTest.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/RedirectionTest.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/RedirectionTest.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/api/ApacheUsage.java b/jetty-client/src/test/java/org/eclipse/jetty/client/api/ApacheUsage.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/api/ApacheUsage.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/api/ApacheUsage.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/api/NingUsage.java b/jetty-client/src/test/java/org/eclipse/jetty/client/api/NingUsage.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/api/NingUsage.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/api/NingUsage.java
diff --git a/jetty-client-new/src/test/java/org/eclipse/jetty/client/api/Usage.java b/jetty-client/src/test/java/org/eclipse/jetty/client/api/Usage.java
similarity index 100%
rename from jetty-client-new/src/test/java/org/eclipse/jetty/client/api/Usage.java
rename to jetty-client/src/test/java/org/eclipse/jetty/client/api/Usage.java
diff --git a/jetty-client-new/src/test/resources/jetty-logging.properties b/jetty-client/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-client-new/src/test/resources/jetty-logging.properties
rename to jetty-client/src/test/resources/jetty-logging.properties
diff --git a/pom.xml b/pom.xml
index d584d88f4d6..4b7890f942c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,7 +381,7 @@
     <module>jetty-distribution</module>
 
     <module>jetty-spring</module>
-    <module>jetty-client-new</module>
+    <module>jetty-client</module>
 
 
     <!-- modules that need fixed and added back, or simply dropped and not maintained