diff --git a/app/src/Controller/Component/RegistryAuthComponent.php b/app/src/Controller/Component/RegistryAuthComponent.php
index aa39db4b9..61441dafa 100644
--- a/app/src/Controller/Component/RegistryAuthComponent.php
+++ b/app/src/Controller/Component/RegistryAuthComponent.php
@@ -49,7 +49,6 @@
 
 namespace App\Controller\Component;
 
-use App\Model\Entity;
 use \App\Lib\Enum\AuthenticationEventEnum;
 use \App\Lib\Enum\SuspendableStatusEnum;
 use \App\Lib\Enum\TemplateableStatusEnum;
diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
index 57bda472c..60e3f9c31 100644
--- a/app/src/View/Helper/FieldHelper.php
+++ b/app/src/View/Helper/FieldHelper.php
@@ -104,9 +104,7 @@ public function calculateLabelAndDescription(string $fieldName): array
     $label = null;
 
     // First, try to autogenerate the field label (if we weren't given one).
-    $pluginDomain = (!empty($this->getPluginName())
-      ? Inflector::underscore($this->getPluginName())
-      : null);
+    $pluginDomain = StringUtilities::pluginToTextDomain($this->getPluginName());
 
     $modelName = $this->getModelName();
     // We try to automagically determine if a description for the field exists by