diff --git a/docs/1.0/readme.adoc b/docs/1.0/readme.adoc
index 78f54d9c..ae913836 100644
--- a/docs/1.0/readme.adoc
+++ b/docs/1.0/readme.adoc
@@ -184,7 +184,7 @@ The dataset-reinstaller component exposes an API for reinstalling datasets that
 have been marked as "ready-for-reinstall".
 
 Handler Client::
-The handler-client component exposes an API for interacting with the VDI plugin
+The plugin-client component exposes an API for interacting with the VDI plugin
 services over HTTP.
 
 Install Cleanup::
diff --git a/lib/async/src/main/kotlin/vdi/component/async/Trigger.kt b/lib/async/src/main/kotlin/vdi/component/async/Trigger.kt
index 088d3a30..3abdb36d 100644
--- a/lib/async/src/main/kotlin/vdi/component/async/Trigger.kt
+++ b/lib/async/src/main/kotlin/vdi/component/async/Trigger.kt
@@ -13,14 +13,14 @@ class Trigger {
   private var triggered = false
 
   suspend fun trigger() {
-    mutex.withLock(this) { triggered = true }
+    mutex.withLock { triggered = true }
     tryRelease()
   }
 
-  suspend fun isTriggered() = mutex.withLock(this) { triggered }
+  suspend fun isTriggered() = mutex.withLock { triggered }
 
   suspend fun await() {
-    mutex.withLock(this) {
+    mutex.withLock {
       if (triggered)
         return release()
     }
@@ -33,7 +33,7 @@ class Trigger {
   }
 
   private suspend fun tryRelease() {
-    mutex.withLock(this) {
+    mutex.withLock {
       if (triggered)
         release()
     }
diff --git a/lib/dataset-reinstaller/build.gradle.kts b/lib/dataset-reinstaller/build.gradle.kts
index 35a8e51d..b5722204 100644
--- a/lib/dataset-reinstaller/build.gradle.kts
+++ b/lib/dataset-reinstaller/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 
   implementation(project(":lib:app-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:plugin-mapping"))
   implementation(project(":lib:s3"))
diff --git a/lib/install-cleanup/build.gradle.kts b/lib/install-cleanup/build.gradle.kts
index cf0ee386..8be3c308 100644
--- a/lib/install-cleanup/build.gradle.kts
+++ b/lib/install-cleanup/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:plugin-mapping"))
 
   implementation("org.veupathdb.vdi:vdi-component-common")
diff --git a/lib/handler-client/build.gradle.kts b/lib/plugin-client/build.gradle.kts
similarity index 100%
rename from lib/handler-client/build.gradle.kts
rename to lib/plugin-client/build.gradle.kts
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/ContentType.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/ContentType.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/ContentType.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/ContentType.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/EP.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/EP.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/EP.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/EP.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/FieldName.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/FieldName.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/FieldName.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/FieldName.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/Header.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/Header.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/Header.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/Header.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/ImportCounter.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/ImportCounter.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/ImportCounter.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/ImportCounter.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClient.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClient.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClient.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClient.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientConfig.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientConfig.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientConfig.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientConfig.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/PluginHandlerClientResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/index.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/index.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/index.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/index.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportBadRequestResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponseType.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponseType.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponseType.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportResponseType.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportSuccessResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportUnhandledErrorResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/imp/ImportValidationErrorResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataBadRequestResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataMissingDependenciesResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponseType.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponseType.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponseType.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataResponseType.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataSuccessResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataUnexpectedErrorResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/ind/InstallDataValidationFailureResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaBadRequestResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponseType.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponseType.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponseType.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaResponseType.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaSuccessResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/inm/InstallMetaUnexpectedErrorResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallBadRequestResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponseType.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponseType.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponseType.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallResponseType.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallSuccessResponseImpl.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponse.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponse.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponse.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponse.kt
diff --git a/lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponseImpl.kt b/lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponseImpl.kt
similarity index 100%
rename from lib/handler-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponseImpl.kt
rename to lib/plugin-client/src/main/kotlin/vdi/component/plugin/client/response/uni/UninstallUnexpectedErrorResponseImpl.kt
diff --git a/lib/plugin-mapping/build.gradle.kts b/lib/plugin-mapping/build.gradle.kts
index 177b7f82..377778eb 100644
--- a/lib/plugin-mapping/build.gradle.kts
+++ b/lib/plugin-mapping/build.gradle.kts
@@ -6,7 +6,7 @@ dependencies {
   implementation(platform(project(":platform")))
 
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
 
   implementation("org.veupathdb.vdi:vdi-component-common")
 
diff --git a/readme.adoc b/readme.adoc
index 2640db16..5abe6852 100644
--- a/readme.adoc
+++ b/readme.adoc
@@ -161,20 +161,20 @@ service, and/or the bootstrapper.
 
 * link:lib/app-db/[App DB Client]
 * link:lib/async/[Async Utilities]
+* link:lib/install-cleanup/[Broken Install Cleanup]
 * link:lib/cache-db/[Cache DB Client]
 * link:https://github.com/VEuPathDB/vdi-component-common[Commons]
+* link:lib/pruner[Dataset Pruner]
 * link:lib/dataset-reinstaller/[Dataset Reinstaller]
-* link:lib/env/[Shared Env Constants & Utilities]
-* link:lib/handler-client[Plugin Server Client]
-* link:lib/install-cleanup/[Broken Install Cleanup]
 * link:https://github.com/VEuPathDB/vdi-component-json[JSON Utilities]
 * link:lib/kafka[Kafka Client]
 * link:lib/ldap[LDAP Utilities]
 * link:lib/module-core/[Module Core]
+* link:lib/plugin-client[Plugin Server Client]
 * link:lib/plugin-mapping[Plugin Mapping]
-* link:lib/pruner[Dataset Pruner]
 * link:lib/rabbit[Rabbit Client]
 * link:lib/s3[S3 Utilities]
+* link:lib/env/[Shared Env Constants & Utilities]
 * link:lib/test-utils[Unit Test Utilities]
 
 === Daemons
diff --git a/service/daemon/reconciler/build.gradle.kts b/service/daemon/reconciler/build.gradle.kts
index ff57be58..32fc83d9 100644
--- a/service/daemon/reconciler/build.gradle.kts
+++ b/service/daemon/reconciler/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))
diff --git a/service/lane/import/build.gradle.kts b/service/lane/import/build.gradle.kts
index 148ceb8d..32818858 100644
--- a/service/lane/import/build.gradle.kts
+++ b/service/lane/import/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))
diff --git a/service/lane/install/build.gradle.kts b/service/lane/install/build.gradle.kts
index bf5ec589..24d4065c 100644
--- a/service/lane/install/build.gradle.kts
+++ b/service/lane/install/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))
diff --git a/service/lane/soft-delete/build.gradle.kts b/service/lane/soft-delete/build.gradle.kts
index d5326287..cbd90c4d 100644
--- a/service/lane/soft-delete/build.gradle.kts
+++ b/service/lane/soft-delete/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))
diff --git a/service/lane/update-meta/build.gradle.kts b/service/lane/update-meta/build.gradle.kts
index cc8c114b..d2a37827 100644
--- a/service/lane/update-meta/build.gradle.kts
+++ b/service/lane/update-meta/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 942f6410..357e5883 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,10 +44,10 @@ include(":lib:async")
 include(":lib:cache-db")
 include(":lib:dataset-reinstaller")
 include(":lib:env")
-include(":lib:handler-client")
 include(":lib:install-cleanup")
 include(":lib:kafka")
 include(":lib:ldap")
+include(":lib:plugin-client")
 include(":lib:plugin-mapping")
 include(":lib:metrics")
 include(":lib:module-core")