diff --git a/core/lib/Drupal/Core/Entity/Field/FieldItemBase.php b/core/lib/Drupal/Core/Entity/Field/FieldItemBase.php
index 60df650..1c6ebd8 100644
--- a/core/lib/Drupal/Core/Entity/Field/FieldItemBase.php
+++ b/core/lib/Drupal/Core/Entity/Field/FieldItemBase.php
@@ -25,8 +25,8 @@
   /**
    * Overrides \Drupal\Core\TypedData\TypedData::__construct().
    */
-  public function __construct(array $definition, $plugin_id, array $plugin_definition, $name = NULL, TypedDataInterface $parent = NULL) {
-    parent::__construct($definition, $plugin_id, $plugin_definition, $name, $parent);
+  public function __construct(array $definition, $data_type, array $type_definition, $name = NULL, TypedDataInterface $parent = NULL) {
+    parent::__construct($definition, $data_type, $type_definition, $name, $parent);
     // Initialize computed properties by default, such that they get cloned
     // with the whole item.
     foreach ($this->getPropertyDefinitions() as $name => $definition) {
diff --git a/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php b/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
index c819ead..3e8fc59 100644
--- a/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
+++ b/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
@@ -61,8 +61,8 @@ class EntityWrapper extends TypedData implements IteratorAggregate, ComplexDataI
   /**
    * Overrides TypedData::__construct().
    */
-  public function __construct(array $definition, $plugin_id, array $plugin_definition, $name = NULL, TypedDataInterface $parent = NULL) {
-    parent::__construct($definition, $plugin_id, $plugin_definition, $name, $parent);
+  public function __construct(array $definition, $data_type, array $type_definition, $name = NULL, TypedDataInterface $parent = NULL) {
+    parent::__construct($definition, $data_type, $type_definition, $name, $parent);
     $this->entityType = isset($this->definition['constraints']['EntityType']) ? $this->definition['constraints']['EntityType'] : NULL;
   }
 
diff --git a/core/lib/Drupal/Core/Entity/Field/Type/Field.php b/core/lib/Drupal/Core/Entity/Field/Type/Field.php
index ecf0e8e..b3e3474 100644
--- a/core/lib/Drupal/Core/Entity/Field/Type/Field.php
+++ b/core/lib/Drupal/Core/Entity/Field/Type/Field.php
@@ -36,8 +36,8 @@ class Field extends ItemList implements FieldInterface {
   /**
    * Overrides TypedData::__construct().
    */
-  public function __construct(array $definition, $plugin_id, array $plugin_definition, $name = NULL, TypedDataInterface $parent = NULL) {
-    parent::__construct($definition, $plugin_id, $plugin_definition, $name, $parent);
+  public function __construct(array $definition, $data_type, array $type_definition, $name = NULL, TypedDataInterface $parent = NULL) {
+    parent::__construct($definition, $data_type, $type_definition, $name, $parent);
     // Always initialize one empty item as most times a value for at least one
     // item will be present. That way prototypes created by
     // \Drupal\Core\TypedData\TypedDataManager::getPropertyInstance() will
diff --git a/core/lib/Drupal/Core/TypedData/TypedData.php b/core/lib/Drupal/Core/TypedData/TypedData.php
index 7271074..fd9558a 100644
--- a/core/lib/Drupal/Core/TypedData/TypedData.php
+++ b/core/lib/Drupal/Core/TypedData/TypedData.php
@@ -43,10 +43,10 @@
    *
    * @param array $definition
    *   The data definition.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
+   * @param string $data_type
+   *   The data type
+   * @param array $type_definition
+   *   The data type definition.
    * @param string $name
    *   (optional) The name of the created property, or NULL if it is the root
    *   of a typed data tree. Defaults to NULL.
@@ -56,10 +56,10 @@
    *
    * @see Drupal\Core\TypedData\TypedDataManager::create()
    */
-  public function __construct(array $definition, $plugin_id, array $plugin_definition, $name = NULL, TypedDataInterface $parent = NULL) {
+  public function __construct(array $definition, $data_type, array $type_definition, $name = NULL, TypedDataInterface $parent = NULL) {
     $this->definition = $definition;
-    $this->pluginId = $plugin_id;
-    $this->pluginDefinition = $plugin_definition;
+    $this->pluginId = $data_type;
+    $this->pluginDefinition = $type_definition;
     $this->parent = $parent;
     $this->name = $name;
   }
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php b/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php
index abb833b..8333029 100644
--- a/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php
+++ b/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php
@@ -54,9 +54,9 @@ class LocaleTypedConfig extends Element {
   public function __construct(array $definition, $name, $langcode, \Drupal\locale\LocaleConfigManager $localeConfig) {
     // @todo parent::__construct() needs a $plugin_id and $plugin_definition,
     // but not sure how to get those.
-    $plugin_id = '';
-    $plugin_definition = array();
-    parent::__construct($definition, $plugin_id, $plugin_definition, $name);
+    $data_type = '';
+    $type_definition = array();
+    parent::__construct($definition, $data_type, $type_definition, $name);
     $this->langcode = $langcode;
     $this->localeConfig = $localeConfig;
   }
diff --git a/core/modules/text/lib/Drupal/text/TextProcessed.php b/core/modules/text/lib/Drupal/text/TextProcessed.php
index 02e5883..4a1679e 100644
--- a/core/modules/text/lib/Drupal/text/TextProcessed.php
+++ b/core/modules/text/lib/Drupal/text/TextProcessed.php
@@ -37,8 +37,8 @@ class TextProcessed extends TypedData {
   /**
    * Overrides TypedData::__construct().
    */
-  public function __construct(array $definition, $plugin_id, array $plugin_definition, $name = NULL, TypedDataInterface $parent = NULL) {
-    parent::__construct($definition, $plugin_id, $plugin_definition, $name, $parent);
+  public function __construct(array $definition, $data_type, array $type_definition, $name = NULL, TypedDataInterface $parent = NULL) {
+    parent::__construct($definition, $data_type, $type_definition, $name, $parent);
 
     if (!isset($definition['settings']['text source'])) {
       throw new InvalidArgumentException("The definition's 'source' key has to specify the name of the text property to be processed.");