diff --git a/core/modules/grid/config/grid.three_column_fluid.yml b/core/modules/grid/config/grid.three_column_fluid.yml
index 345e90c..95f6dc0 100644
--- a/core/modules/grid/config/grid.three_column_fluid.yml
+++ b/core/modules/grid/config/grid.three_column_fluid.yml
@@ -1,6 +1,6 @@
 id: three_column_fluid
 label: Three column fluid
-types: equal_column
+type: equal_column
 options:
   type: 'fluid'
   width: 100
diff --git a/core/modules/grid/lib/Drupal/grid/Grid.php b/core/modules/grid/lib/Drupal/grid/Grid.php
index 15bd121..19b7b51 100644
--- a/core/modules/grid/lib/Drupal/grid/Grid.php
+++ b/core/modules/grid/lib/Drupal/grid/Grid.php
@@ -41,14 +41,14 @@ class Grid extends ConfigEntityBase implements GridInterface {
    *
    * @var string
    */
-  public $pluginId;
+  public $type;
 
   /**
    * Plugin configuration to instantiate the plugin instance.
    *
    * @var array
    */
-  public $pluginConfiguration;
+  public $options;
 
   /**
    * Instantiated plugin to handle the grid.