diff --git a/src/CheckAgentServices.php b/src/CheckAgentServices.php
index 170d51e..24e56b0 100644
--- a/src/CheckAgentServices.php
+++ b/src/CheckAgentServices.php
@@ -5,7 +5,7 @@ namespace Drupal\user_agent_class;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
- * Class CheckAgentServices.
+ * Implements CheckAgentServicesInterface for CheckAgentServices.
  */
 class CheckAgentServices implements CheckAgentServicesInterface {
 
diff --git a/src/CheckAgentServicesInterface.php b/src/CheckAgentServicesInterface.php
index 7552e03..ef51ed4 100644
--- a/src/CheckAgentServicesInterface.php
+++ b/src/CheckAgentServicesInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\user_agent_class;
 
 /**
- * Interface CheckAgentServicesInterface.
+ * Check Agent Services Interface.
  */
 interface CheckAgentServicesInterface {
 
diff --git a/src/Controller/CheckUserAgentController.php b/src/Controller/CheckUserAgentController.php
index 52d5efc..63dc5f9 100644
--- a/src/Controller/CheckUserAgentController.php
+++ b/src/Controller/CheckUserAgentController.php
@@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Drupal\Component\Utility\Xss;
 
 /**
- * Class CheckUserAgentController.
+ * Controller for CheckUserAgentController.
  */
 class CheckUserAgentController extends ControllerBase {
 
diff --git a/src/EventSubscriber/UserAgentSubscriber.php b/src/EventSubscriber/UserAgentSubscriber.php
index 6f09a68..436ed0c 100644
--- a/src/EventSubscriber/UserAgentSubscriber.php
+++ b/src/EventSubscriber/UserAgentSubscriber.php
@@ -10,7 +10,7 @@ use Drupal\user_agent_class\CheckAgentServices;
 use Drupal\Core\Config\ConfigFactory;
 
 /**
- * Class UserAgentSubscriber.
+ * Implements EventSubscriberInterface for UserAgentSubscriber.
  */
 class UserAgentSubscriber implements EventSubscriberInterface {
 
diff --git a/src/Form/DeviceEntityForm.php b/src/Form/DeviceEntityForm.php
index 4278b2b..c593a66 100644
--- a/src/Form/DeviceEntityForm.php
+++ b/src/Form/DeviceEntityForm.php
@@ -6,7 +6,7 @@ use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Class DeviceEntityForm.
+ * Entity Form for DeviceEntityForm.
  */
 class DeviceEntityForm extends EntityForm {
 
diff --git a/src/Form/ProvideForm.php b/src/Form/ProvideForm.php
index 40ab700..71f8114 100644
--- a/src/Form/ProvideForm.php
+++ b/src/Form/ProvideForm.php
@@ -6,7 +6,7 @@ use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Class ProvideForm.
+ * Provide Form.
  */
 class ProvideForm extends ConfigFormBase {
 
diff --git a/src/Form/UserAgentEntityForm.php b/src/Form/UserAgentEntityForm.php
index cc47f11..da643d2 100644
--- a/src/Form/UserAgentEntityForm.php
+++ b/src/Form/UserAgentEntityForm.php
@@ -6,7 +6,7 @@ use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Class UserAgentEntityForm.
+ * Entity Form for UserAgentEntityForm.
  */
 class UserAgentEntityForm extends EntityForm {