diff --git a/templates/module/src/Command/command.php.twig b/templates/module/src/Command/command.php.twig
index 305095753..7e6f264dd 100644
--- a/templates/module/src/Command/command.php.twig
+++ b/templates/module/src/Command/command.php.twig
@@ -37,7 +37,7 @@ class {{ class_name }} extends Command {% endblock %}
 {% if services is not empty %}
 
   /**
-   * {@inheritdoc}
+   * Constructs a new {{ class_name }} object.
    */
   public function __construct({{ servicesAsParameters(services)|join(', ') }}) {
 {{ serviceClassInitialization(services) }}
diff --git a/templates/module/src/Controller/controller.php.twig b/templates/module/src/Controller/controller.php.twig
index cf52f16d1..57c1ad137 100644
--- a/templates/module/src/Controller/controller.php.twig
+++ b/templates/module/src/Controller/controller.php.twig
@@ -25,7 +25,7 @@ class {{ class_name }} extends ControllerBase {% endblock %}
 {% if services is not empty %}
 
   /**
-   * {@inheritdoc}
+   * Constructs a new {{ class_name }} object.
    */
   public function __construct({{ servicesAsParameters(services)|join(', ') }}) {
 {{ serviceClassInitialization(services) }}
diff --git a/templates/module/src/Form/form-config.php.twig b/templates/module/src/Form/form-config.php.twig
index 52ca88bfa..9dc7a7dcb 100644
--- a/templates/module/src/Form/form-config.php.twig
+++ b/templates/module/src/Form/form-config.php.twig
@@ -26,6 +26,9 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class {{ class_name }} extends ConfigFormBase {% endblock %}
 {% block class_construct %}
 {% if services is not empty %}
+  /**
+   * Constructs a new {{ class_name }} object.
+   */
   public function __construct(
     ConfigFactoryInterface $config_factory,
       {{ servicesAsParameters(services)|join(',\n    ') }}
diff --git a/templates/module/src/Form/form.php.twig b/templates/module/src/Form/form.php.twig
index a495d6a9c..a5beb3c9c 100644
--- a/templates/module/src/Form/form.php.twig
+++ b/templates/module/src/Form/form.php.twig
@@ -25,6 +25,9 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class {{ class_name }} extends FormBase {% endblock %}
 {% block class_construct %}
 {% if services is not empty %}
+  /**
+   * Constructs a new {{ class_name }} object.
+   */
   public function __construct(
     {{ servicesAsParameters(services)|join(',\n    ') }}
   ) {
diff --git a/templates/module/src/Plugin/Block/block.php.twig b/templates/module/src/Plugin/Block/block.php.twig
index e223b856f..c7d4cec4f 100644
--- a/templates/module/src/Plugin/Block/block.php.twig
+++ b/templates/module/src/Plugin/Block/block.php.twig
@@ -32,7 +32,7 @@ class {{class_name}} extends BlockBase {% if services is not empty %}implements
 {% block class_construct %}
 {% if services is not empty %}
   /**
-   * Construct.
+   * Constructs a new {{class_name}} object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
diff --git a/templates/module/src/Plugin/Condition/condition.php.twig b/templates/module/src/Plugin/Condition/condition.php.twig
index 569e56298..c782c90f5 100644
--- a/templates/module/src/Plugin/Condition/condition.php.twig
+++ b/templates/module/src/Plugin/Condition/condition.php.twig
@@ -42,7 +42,7 @@ public static function create(ContainerInterface $container, array $configuratio
 }
 
 /**
- * Creates a new ExampleCondition instance.
+ * Creates a new {{ class_name }} object.
  *
  * @param array $configuration
  *   The plugin configuration, i.e. an array with configuration values keyed
diff --git a/templates/module/src/Plugin/Field/FieldFormatter/imageformatter.php.twig b/templates/module/src/Plugin/Field/FieldFormatter/imageformatter.php.twig
index 83e6b7fcc..92059a4d4 100644
--- a/templates/module/src/Plugin/Field/FieldFormatter/imageformatter.php.twig
+++ b/templates/module/src/Plugin/Field/FieldFormatter/imageformatter.php.twig
@@ -58,7 +58,7 @@ class {{ class_name }} extends ImageFormatterBase implements ContainerFactoryPlu
  protected $imageStyleStorage;
 
 /**
- * Constructs an ImageFormatter object.
+ * Constructs a new {{ class_name }} object.
  *
  * @param string $plugin_id
  *   The plugin_id for the formatter.
diff --git a/templates/module/src/Plugin/Mail/mail.php.twig b/templates/module/src/Plugin/Mail/mail.php.twig
index d2e466e4c..878b3eea2 100644
--- a/templates/module/src/Plugin/Mail/mail.php.twig
+++ b/templates/module/src/Plugin/Mail/mail.php.twig
@@ -31,7 +31,7 @@ class {{class_name}} extends PhpMail {% if services is not empty %}implements Co
 {% block class_construct %}
 {% if services is not empty %}
   /**
-   * Construct.
+   * Constructs a new {{class_name}} object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
diff --git a/templates/module/src/Plugin/Rest/Resource/rest.php.twig b/templates/module/src/Plugin/Rest/Resource/rest.php.twig
index a5c3bbdce..9145f2e2a 100644
--- a/templates/module/src/Plugin/Rest/Resource/rest.php.twig
+++ b/templates/module/src/Plugin/Rest/Resource/rest.php.twig
@@ -43,7 +43,7 @@ class {{ class_name }} extends ResourceBase {% endblock %}
 {% block class_construct %}
 
   /**
-   * Constructs a Drupal\rest\Plugin\ResourceBase object.
+   * Constructs a new {{ class_name }} object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
diff --git a/templates/module/src/Plugin/skeleton.php.twig b/templates/module/src/Plugin/skeleton.php.twig
index 4354a98f9..ccf2caf2f 100644
--- a/templates/module/src/Plugin/skeleton.php.twig
+++ b/templates/module/src/Plugin/skeleton.php.twig
@@ -39,7 +39,7 @@ class {{class_name}} implements {% if plugin_interface is not empty %} {{ plugin
 {% block class_construct %}
 {% if services is not empty %}
   /**
-   * Construct.
+   * Constructs a new {{class_name}} object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
diff --git a/templates/module/src/TwigExtension/twig-extension.php.twig b/templates/module/src/TwigExtension/twig-extension.php.twig
index 5b6f54758..438965049 100644
--- a/templates/module/src/TwigExtension/twig-extension.php.twig
+++ b/templates/module/src/TwigExtension/twig-extension.php.twig
@@ -36,7 +36,7 @@ class {{ class }} extends \Twig_Extension {% endblock %}
     {% if services|length > 1 %}
 
    /**
-    * Constructor.
+    * Constructs a new {{ class }} object.
     */
     public function __construct({{ servicesAsParameters(services)|join(', ') }}) {
         parent::__construct($renderer);
diff --git a/templates/module/src/cache-context.php.twig b/templates/module/src/cache-context.php.twig
index c7dcbf094..5445fb3bf 100644
--- a/templates/module/src/cache-context.php.twig
+++ b/templates/module/src/cache-context.php.twig
@@ -24,8 +24,8 @@ class {{ class }} implements CacheContextInterface {% endblock %}
 {% block class_construct %}
 
   /**
-  * Constructor.
-  */
+   * Constructs a new {{ class }} object.
+   */
   public function __construct({{ servicesAsParameters(services)|join(', ') }}) {
   {{ serviceClassInitialization(services) }}
   }
diff --git a/templates/module/src/event-subscriber.php.twig b/templates/module/src/event-subscriber.php.twig
index a8fded0f3..d936b36cf 100644
--- a/templates/module/src/event-subscriber.php.twig
+++ b/templates/module/src/event-subscriber.php.twig
@@ -24,7 +24,7 @@ class {{ class }} implements EventSubscriberInterface {% endblock %}
 {% block class_construct %}
 
   /**
-   * Constructor.
+   * Constructs a new {{ class }} object.
    */
   public function __construct({{ servicesAsParameters(services)|join(', ') }}) {
 {{ serviceClassInitialization(services) }}
diff --git a/templates/module/src/plugin-type-annotation-manager.php.twig b/templates/module/src/plugin-type-annotation-manager.php.twig
index f8645554b..2ed39b5df 100644
--- a/templates/module/src/plugin-type-annotation-manager.php.twig
+++ b/templates/module/src/plugin-type-annotation-manager.php.twig
@@ -22,7 +22,7 @@ class {{ class_name }}Manager extends DefaultPluginManager {% endblock %}
 {% block class_methods %}
 
   /**
-   * Constructor for {{ class_name }}Manager objects.
+   * Constructs a new {{ class_name }}Manager object.
    *
    * @param \Traversable $namespaces
    *   An object that implements \Traversable which contains the root paths
diff --git a/templates/module/src/service.php.twig b/templates/module/src/service.php.twig
index 2deb9d3eb..8116f27ce 100644
--- a/templates/module/src/service.php.twig
+++ b/templates/module/src/service.php.twig
@@ -16,7 +16,7 @@ namespace Drupal\{{module}};{% endblock %}
 class {{ class }}{% if(interface is defined and interface) %} implements {{ interface }}{% endif %} {% endblock %}
 {% block class_construct %}
   /**
-   * Constructor.
+   * Constructs a new {{ class }} object.
    */
   public function __construct({{ servicesAsParameters(services)|join(', ') }}) {
 {{ serviceClassInitialization(services) }}
diff --git a/templates/module/src/yaml-plugin-manager.php.twig b/templates/module/src/yaml-plugin-manager.php.twig
index b7379d3ae..16d486bc5 100644
--- a/templates/module/src/yaml-plugin-manager.php.twig
+++ b/templates/module/src/yaml-plugin-manager.php.twig
@@ -35,7 +35,7 @@ class {{ plugin_class }}Manager extends DefaultPluginManager implements {{ plugi
   ];
 
   /**
-   * Constructs a {{ plugin_class }}Manager object.
+   * Constructs a new {{ plugin_class }}Manager object.
    *
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.