diff --git a/README.md b/README.md
index d743d88..9319c69 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
 
 In addition to running the integration tests, you can also build the project with `mvn clean package` and then run a simple connection test with 
 
-    java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=<agent-connect-timeout>,<agent-read-timeout> -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher <url> <client-type> [<client-connect-timeout> <client-read-timeout>]
+    java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=<agent-connect-timeout>,<agent-read-timeout> -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher <url> <client-type> [<client-connect-timeout> <client-read-timeout>]
     
  The parameters are as follows:
  
@@ -34,14 +34,14 @@
  For a test that always fails, set one of the timeouts to 1. Both executions listed below will typically fail:
  
  ```
-java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
-java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1 -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher https://sling.apache.org JavaNet
  ```
  
 In contrast, the execution below should succeed:
 
 ```
-java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher https://sling.apache.org JavaNet
 ```
 
 To use this in your own project you should 
diff --git a/pom.xml b/pom.xml
index 2a6416e..5bb68b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
                             <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
                             <archive>
                                 <manifestEntries>
-                                    <Premain-Class>org.apache.sling.uca.impl.Agent</Premain-Class>
+                                    <Premain-Class>org.apache.sling.cta.impl.Agent</Premain-Class>
                                     <Can-Redefine-Classes>true</Can-Redefine-Classes>
                                     <Can-Retransform-Classes>true</Can-Retransform-Classes>
                                 </manifestEntries>
diff --git a/src/main/java/org/apache/sling/uca/impl/Agent.java b/src/main/java/org/apache/sling/cta/impl/Agent.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/Agent.java
rename to src/main/java/org/apache/sling/cta/impl/Agent.java
index d46c56c..3c5776b 100644
--- a/src/main/java/org/apache/sling/uca/impl/Agent.java
+++ b/src/main/java/org/apache/sling/cta/impl/Agent.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
diff --git a/src/main/java/org/apache/sling/uca/impl/AgentInfo.java b/src/main/java/org/apache/sling/cta/impl/AgentInfo.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/AgentInfo.java
rename to src/main/java/org/apache/sling/cta/impl/AgentInfo.java
index 1a4f641..b12b61f 100644
--- a/src/main/java/org/apache/sling/uca/impl/AgentInfo.java
+++ b/src/main/java/org/apache/sling/cta/impl/AgentInfo.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.util.ArrayList;
diff --git a/src/main/java/org/apache/sling/uca/impl/AgentInfoMBean.java b/src/main/java/org/apache/sling/cta/impl/AgentInfoMBean.java
similarity index 97%
rename from src/main/java/org/apache/sling/uca/impl/AgentInfoMBean.java
rename to src/main/java/org/apache/sling/cta/impl/AgentInfoMBean.java
index d0b9eb9..294c012 100644
--- a/src/main/java/org/apache/sling/uca/impl/AgentInfoMBean.java
+++ b/src/main/java/org/apache/sling/cta/impl/AgentInfoMBean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 /**
  * Exposes runtime information about the agent using <tt>JMX</tt>.
diff --git a/src/main/java/org/apache/sling/uca/impl/HttpClient3TimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/HttpClient3TimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/HttpClient3TimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/HttpClient3TimeoutTransformer.java
index aa0b807..c1486e6 100644
--- a/src/main/java/org/apache/sling/uca/impl/HttpClient3TimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/HttpClient3TimeoutTransformer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.util.Collections;
 
diff --git a/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/HttpClient4TimeoutTransformer.java
similarity index 97%
rename from src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/HttpClient4TimeoutTransformer.java
index f888936..8ab7d8e 100644
--- a/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/HttpClient4TimeoutTransformer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import javassist.bytecode.Descriptor;
 
diff --git a/src/main/java/org/apache/sling/uca/impl/JavaNetTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/JavaNetTimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/JavaNetTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/JavaNetTimeoutTransformer.java
index 2e5654b..302c400 100644
--- a/src/main/java/org/apache/sling/uca/impl/JavaNetTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/JavaNetTimeoutTransformer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.net.URLConnection;
 import java.util.HashSet;
diff --git a/src/main/java/org/apache/sling/uca/impl/Log.java b/src/main/java/org/apache/sling/cta/impl/Log.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/Log.java
rename to src/main/java/org/apache/sling/cta/impl/Log.java
index 900f426..e0e3213 100644
--- a/src/main/java/org/apache/sling/uca/impl/Log.java
+++ b/src/main/java/org/apache/sling/cta/impl/Log.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/src/main/java/org/apache/sling/uca/impl/MBeanAwareTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/MBeanAwareTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
index bf7eb02..490507e 100644
--- a/src/main/java/org/apache/sling/uca/impl/MBeanAwareTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.security.ProtectionDomain;
diff --git a/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/OkHttpTimeoutTransformer.java
similarity index 97%
rename from src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/OkHttpTimeoutTransformer.java
index 458996e..7be4cc6 100644
--- a/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/OkHttpTimeoutTransformer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import javassist.bytecode.Descriptor;
 
diff --git a/src/main/java/org/apache/sling/uca/impl/UpdateFieldsInConstructorTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/UpdateFieldsInConstructorTimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/UpdateFieldsInConstructorTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/UpdateFieldsInConstructorTimeoutTransformer.java
index 3757137..7fcbb10 100644
--- a/src/main/java/org/apache/sling/uca/impl/UpdateFieldsInConstructorTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/UpdateFieldsInConstructorTimeoutTransformer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.util.Collections;
 
diff --git a/src/test/java/org/apache/sling/uca/impl/AgentIT.java b/src/test/java/org/apache/sling/cta/impl/AgentIT.java
similarity index 96%
rename from src/test/java/org/apache/sling/uca/impl/AgentIT.java
rename to src/test/java/org/apache/sling/cta/impl/AgentIT.java
index 0fd4d8a..eaeb63a 100644
--- a/src/test/java/org/apache/sling/uca/impl/AgentIT.java
+++ b/src/test/java/org/apache/sling/cta/impl/AgentIT.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import static java.time.Duration.ofSeconds;
 import static java.util.Objects.requireNonNull;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.HC3;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.HC4;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.JavaNet;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.OkHttp;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.HC3;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.HC4;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.JavaNet;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.OkHttp;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTimeout;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,7 +40,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.sling.uca.impl.HttpClientLauncher.ClientType;
+import org.apache.sling.cta.impl.HttpClientLauncher.ClientType;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/src/test/java/org/apache/sling/uca/impl/AgentLauncher.java b/src/test/java/org/apache/sling/cta/impl/AgentLauncher.java
similarity index 97%
rename from src/test/java/org/apache/sling/uca/impl/AgentLauncher.java
rename to src/test/java/org/apache/sling/cta/impl/AgentLauncher.java
index 93a006b..a3b4113 100644
--- a/src/test/java/org/apache/sling/uca/impl/AgentLauncher.java
+++ b/src/test/java/org/apache/sling/cta/impl/AgentLauncher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.sling.uca.impl.HttpClientLauncher.ClientType;
+import org.apache.sling.cta.impl.HttpClientLauncher.ClientType;
 
 /**
  * Launches the {@link HttpClientLauncher} as a separate process with the timeout agent enabled
diff --git a/src/test/java/org/apache/sling/uca/impl/ErrorDescriptor.java b/src/test/java/org/apache/sling/cta/impl/ErrorDescriptor.java
similarity index 93%
rename from src/test/java/org/apache/sling/uca/impl/ErrorDescriptor.java
rename to src/test/java/org/apache/sling/cta/impl/ErrorDescriptor.java
index 840ea05..d70b76f 100644
--- a/src/test/java/org/apache/sling/uca/impl/ErrorDescriptor.java
+++ b/src/test/java/org/apache/sling/cta/impl/ErrorDescriptor.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.io.IOException;
 
-import org.apache.sling.uca.impl.HttpClientLauncher.ClientType;
+import org.apache.sling.cta.impl.HttpClientLauncher.ClientType;
 
 /**
  * Data class for defining specific error messages related to individual {@link ClientType client types}. 
diff --git a/src/test/java/org/apache/sling/uca/impl/HttpClientLauncher.java b/src/test/java/org/apache/sling/cta/impl/HttpClientLauncher.java
similarity index 99%
rename from src/test/java/org/apache/sling/uca/impl/HttpClientLauncher.java
rename to src/test/java/org/apache/sling/cta/impl/HttpClientLauncher.java
index d2408de..b7e731d 100644
--- a/src/test/java/org/apache/sling/uca/impl/HttpClientLauncher.java
+++ b/src/test/java/org/apache/sling/cta/impl/HttpClientLauncher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerControl.java b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerControl.java
similarity index 97%
rename from src/test/java/org/apache/sling/uca/impl/MisbehavingServerControl.java
rename to src/test/java/org/apache/sling/cta/impl/MisbehavingServerControl.java
index 0161006..d18ac2c 100644
--- a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerControl.java
+++ b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.time.Duration;
 
diff --git a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerExtension.java
similarity index 98%
rename from src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java
rename to src/test/java/org/apache/sling/cta/impl/MisbehavingServerExtension.java
index f5bfe1f..780c104 100644
--- a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java
+++ b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerExtension.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.io.IOException;
 import java.time.Duration;
diff --git a/src/test/java/org/apache/sling/uca/impl/RecordedThrowable.java b/src/test/java/org/apache/sling/cta/impl/RecordedThrowable.java
similarity index 97%
rename from src/test/java/org/apache/sling/uca/impl/RecordedThrowable.java
rename to src/test/java/org/apache/sling/cta/impl/RecordedThrowable.java
index 63ba806..2ef0fee 100644
--- a/src/test/java/org/apache/sling/uca/impl/RecordedThrowable.java
+++ b/src/test/java/org/apache/sling/cta/impl/RecordedThrowable.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 /**
  * Basic information about a {@link Throwable} that was recorded in a file
diff --git a/src/test/java/org/apache/sling/uca/impl/TestTimeouts.java b/src/test/java/org/apache/sling/cta/impl/TestTimeouts.java
similarity index 98%
rename from src/test/java/org/apache/sling/uca/impl/TestTimeouts.java
rename to src/test/java/org/apache/sling/cta/impl/TestTimeouts.java
index 0d5cb36..3948ae3 100644
--- a/src/test/java/org/apache/sling/uca/impl/TestTimeouts.java
+++ b/src/test/java/org/apache/sling/cta/impl/TestTimeouts.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
 
 import java.time.Duration;
 import java.util.Objects;