diff --git a/dev/quidem b/dev/quidem
index dec86fc9553..1a7d3f0ec96 100755
--- a/dev/quidem
+++ b/dev/quidem
@@ -28,7 +28,7 @@ OPTS+=" -Dsurefire.rerunFailingTestsCount=0"
 OPTS+=" -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugin.surefire.SurefirePlugin=INFO"
 [[ $@ =~ "-q" ]] && OPTS+=" -Dsurefire.trimStackTrace=true"
 
-OPTS+=" -pl quidem-it -Dtest=QTest"
+OPTS+=" -pl quidem-ut -Dtest=QTest"
 OPTS+=" org.apache.maven.plugins:maven-surefire-plugin:test"
 
 case "$1" in
diff --git a/pom.xml b/pom.xml
index 15b47184ff5..09d237a3005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
         <module>integration-tests-ex/tools</module>
         <module>integration-tests-ex/image</module>
         <module>integration-tests-ex/cases</module>
-        <module>quidem-it</module>
+        <module>quidem-ut</module>
     </modules>
 
     <repositories>
diff --git a/quidem-it/README.md b/quidem-ut/README.md
similarity index 92%
rename from quidem-it/README.md
rename to quidem-ut/README.md
index 999a5103ceb..5b594a3c8f4 100644
--- a/quidem-it/README.md
+++ b/quidem-ut/README.md
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-# Quidem IT
+# Quidem UT
 
 Enables to write sql level tests easily.
 Can be used to write tests against existing test backends (ComponentSupplier) - by doing so the testcases can be moved closer to the excercised codes.
@@ -55,16 +55,16 @@ git clone --branch quidem-record https://github.com/kgyrtkirk/druid
 
 * make sure to build the project first; one way to do that is:
   ```bash
-  mvn install -pl quidem-it/ -am -DskipTests -Pskip-static-checks
+  mvn install -pl quidem-ut/ -am -DskipTests -Pskip-static-checks
   ```
 * launch the broker instance with:
   ```bash
-  mvn exec:exec -pl quidem-it -Dquidem.record.autostart=true
+  mvn exec:exec -pl quidem-ut -Dquidem.record.autostart=true
   ```
   * the broker will be running at http://localhost:12345
   * the used test configuration backend can configured by supplying `quidem.uri`
     ```bash
-    mvn exec:exec -pl quidem-it -Dquidem.uri=druidtest:///?componentSupplier=ThetaSketchComponentSupplier
+    mvn exec:exec -pl quidem-ut -Dquidem.uri=druidtest:///?componentSupplier=ThetaSketchComponentSupplier
     ``` 
   * new record files can be started by calling http://localhost:12345/quidem/start
     * if `quidem.record.autostart` is omitted recording will not start
diff --git a/quidem-it/pom.xml b/quidem-ut/pom.xml
similarity index 99%
rename from quidem-it/pom.xml
rename to quidem-ut/pom.xml
index 9710ac4a736..ac48af25c17 100644
--- a/quidem-it/pom.xml
+++ b/quidem-ut/pom.xml
@@ -23,9 +23,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>druid-quidem-it</artifactId>
-    <name>druid-quidem-it</name>
-    <description>druid-quidem-it</description>
+    <artifactId>druid-quidem-ut</artifactId>
+    <name>druid-quidem-ut</name>
+    <description>druid-quidem-ut</description>
 
     <parent>
         <groupId>org.apache.druid</groupId>
diff --git a/quidem-it/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java b/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
similarity index 100%
rename from quidem-it/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
rename to quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
diff --git a/quidem-it/src/main/java/org/apache/druid/quidem/Launcher.java b/quidem-ut/src/main/java/org/apache/druid/quidem/Launcher.java
similarity index 100%
rename from quidem-it/src/main/java/org/apache/druid/quidem/Launcher.java
rename to quidem-ut/src/main/java/org/apache/druid/quidem/Launcher.java
diff --git a/quidem-it/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java
similarity index 100%
rename from quidem-it/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java
rename to quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java
diff --git a/quidem-it/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java
similarity index 97%
rename from quidem-it/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java
rename to quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java
index 557ea5f79b9..68d2f31ac81 100644
--- a/quidem-it/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java
+++ b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java
@@ -38,7 +38,7 @@ import java.net.URI;
 public class QuidemCaptureResource
 {
   public static final File RECORD_PATH = ProjectPathUtils
-      .getPathFromProjectRoot("quidem-it/src/test/quidem/org.apache.druid.quidem.QTest");
+      .getPathFromProjectRoot("quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest");
   private URI quidemURI;
   private QuidemRecorder recorder = null;
   private DruidHookDispatcher hookDispatcher;
diff --git a/quidem-it/src/main/java/org/apache/druid/quidem/QuidemRecorder.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
similarity index 100%
rename from quidem-it/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
rename to quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
diff --git a/quidem-it/src/test/java/org/apache/druid/quidem/LauncherSmokeTest.java b/quidem-ut/src/test/java/org/apache/druid/quidem/LauncherSmokeTest.java
similarity index 100%
rename from quidem-it/src/test/java/org/apache/druid/quidem/LauncherSmokeTest.java
rename to quidem-ut/src/test/java/org/apache/druid/quidem/LauncherSmokeTest.java
diff --git a/quidem-it/src/test/java/org/apache/druid/quidem/QTest.java b/quidem-ut/src/test/java/org/apache/druid/quidem/QTest.java
similarity index 96%
rename from quidem-it/src/test/java/org/apache/druid/quidem/QTest.java
rename to quidem-ut/src/test/java/org/apache/druid/quidem/QTest.java
index 58782af50d5..83167a18a16 100644
--- a/quidem-it/src/test/java/org/apache/druid/quidem/QTest.java
+++ b/quidem-ut/src/test/java/org/apache/druid/quidem/QTest.java
@@ -37,7 +37,7 @@ public class QTest extends DruidQuidemTestBase
   @Override
   protected File getTestRoot()
   {
-    return ProjectPathUtils.getPathFromProjectRoot("quidem-it/src/test/quidem/" + getClass().getName());
+    return ProjectPathUtils.getPathFromProjectRoot("quidem-ut/src/test/quidem/" + getClass().getName());
   }
 
   @Test
diff --git a/quidem-it/src/test/quidem/org.apache.druid.quidem.QTest/example.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/example.iq
similarity index 100%
rename from quidem-it/src/test/quidem/org.apache.druid.quidem.QTest/example.iq
rename to quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/example.iq