diff --git a/core/modules/grid/config/grid.fluid_12.yml b/core/modules/grid/config/grid.fluid_12.yml
index e170dd7..774b630 100644
--- a/core/modules/grid/config/grid.fluid_12.yml
+++ b/core/modules/grid/config/grid.fluid_12.yml
@@ -2,7 +2,7 @@ id: fluid_12
 label: Twelve column fluid
 type: equal_column
 options:
-  type: 'fluid'
+  units: '%'
   width: 100
   columns: 12
   padding_width: 1.5
diff --git a/core/modules/grid/config/grid.fluid_3.yml b/core/modules/grid/config/grid.fluid_3.yml
index 258133c..7e6a9a6 100644
--- a/core/modules/grid/config/grid.fluid_3.yml
+++ b/core/modules/grid/config/grid.fluid_3.yml
@@ -2,7 +2,7 @@ id: fluid_3
 label: Three column fluid
 type: equal_column
 options:
-  type: 'fluid'
+  units: '%'
   width: 100
   columns: 3
   padding_width: 1.5
diff --git a/core/modules/grid/config/grid.fluid_6.yml b/core/modules/grid/config/grid.fluid_6.yml
index 319aacc..1d7fbcb 100644
--- a/core/modules/grid/config/grid.fluid_6.yml
+++ b/core/modules/grid/config/grid.fluid_6.yml
@@ -2,7 +2,7 @@ id: fluid_6
 label: Six column fluid
 type: equal_column
 options:
-  type: 'fluid'
+  units: '%'
   width: 100
   columns: 6
   padding_width: 1.5
diff --git a/core/modules/grid/config/grid.ninesixty_12.yml b/core/modules/grid/config/grid.ninesixty_12.yml
index 405317c..5409789 100644
--- a/core/modules/grid/config/grid.ninesixty_12.yml
+++ b/core/modules/grid/config/grid.ninesixty_12.yml
@@ -2,7 +2,7 @@ id: ninesixty_12
 label: '960px wide, 12 column grid'
 type: equal_column
 options:
-  type: 'fixed'
+  units: 'px'
   width: 960
   columns: 12
   padding_width: 20
diff --git a/core/modules/grid/config/grid.ninesixty_16.yml b/core/modules/grid/config/grid.ninesixty_16.yml
index 4ddff62..2cd9c65 100644
--- a/core/modules/grid/config/grid.ninesixty_16.yml
+++ b/core/modules/grid/config/grid.ninesixty_16.yml
@@ -2,7 +2,7 @@ id: ninesixty_16
 label: '960px wide, 16 column grid'
 type: equal_column
 options:
-  type: 'fixed'
+  units: 'px'
   width: 960
   columns: 16
   padding_width: 20
diff --git a/core/modules/grid/grid.module b/core/modules/grid/grid.module
index 396ae6e..7d99dc3 100644
--- a/core/modules/grid/grid.module
+++ b/core/modules/grid/grid.module
@@ -12,7 +12,7 @@
  */
 function grid_entity_info() {
   $types['grid'] = array(
-    'label' => 'Grid',
+    'label' => t('Grid'),
     'entity class' => 'Drupal\grid\Grid',
     'controller class' => 'Drupal\Core\Config\Entity\ConfigStorageController',
     'config prefix' => 'grid',
diff --git a/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php b/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php
index fefd24f..a465c2c 100644
--- a/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php
+++ b/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php
@@ -68,19 +68,13 @@ class EqualColumn implements GridInterface {
   /**
    * Constructor.
    */
-  public function __construct($id, $type, $width, $columns, $padding_width, $gutter_width) {
+  public function __construct($id, $units, $width, $columns, $padding_width, $gutter_width) {
     $this->id = $id;
     $this->columns = $columns;
     $this->padding = $padding_width;
     $this->gutter = $gutter_width;
-    if ($type === 'fluid') {
-      $this->width = 100;
-      $this->units = '%';
-    }
-    else {
-      $this->width = $width;
-      $this->units = 'px';
-    }
+    $this->width = $width;
+    $this->units = $units;
   }
 
   /**