diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php
index 2fa2950..5f900a5 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php
@@ -82,12 +82,22 @@ public function buildOptionsForm(&$form, &$form_state) {
           '#type' => 'textfield',
           '#title' => $id,
           '#default_value' => isset($this->options['aliases'][$id]) ? $this->options['aliases'][$id] : '',
+          '#element_validate' => array(array($this, 'validateAliasName')),
         );
       }
     }
   }
 
   /**
+   * Form element validation handler for \Drupal\rest\Plugin\views\row\DataFieldRow::buildOptionsForm().
+   */
+  public function validateAliasName($element, &$form_state) {
+    if (preg_match('@[^A-Za-z0-9_-]+@', $element['#value'])) {
+      form_error($element, t('The machine-readable name must contain only letters, numbers, dashes and underscores.'));
+    }
+  }
+
+  /**
    * Overrides \Drupal\views\Plugin\views\row\RowPluginBase::validateOptionsForm().
    */
   public function validateOptionsForm(&$form, &$form_state) {
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
index 6f94923..fc1fb40 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
@@ -13,8 +13,10 @@
 /**
  * Tests the serializer style plugin.
  *
- * @see \Drupal\views\Plugin\display\Data
- * @see \Drupal\views\Plugin\style\Serialize
+ * @see \Drupal\rest\Plugin\views\display\RestExport
+ * @see \Drupal\rest\Plugin\views\style\Serializer
+ * @see \Drupal\rest\Plugin\views\row\DataEntityRow
+ * @see \Drupal\rest\Plugin\views\row\DataFieldRow
  */
 class StyleSerializerTest extends PluginTestBase {
 
@@ -174,11 +176,15 @@ public function testUIFieldAlias() {
 
     // Test a random aliases for fields, they should be replaced.
     $random_name = $this->randomName();
-    // randomString() might produce a " " at the end but the DataFieldRow plugin
-    // trims the values.
-    $random_string = trim($this->randomString());
-    $edit = array('row_options[aliases][name]' => $random_name, 'row_options[aliases][nothing]' => $random_string);
+    $random_name_2 = chr(rand(123, 255)) . $this->randomName();
+    $edit = array('row_options[aliases][name]' => $random_name, 'row_options[aliases][nothing]' => $random_name_2);
     $this->drupalPost($row_options, $edit, t('Apply'));
+    $this->assertText(t('The machine-readable name must contain only letters, numbers, dashes and underscores.'));
+
+    $random_name_2 = $this->randomName();
+    $edit = array('row_options[aliases][name]' => $random_name, 'row_options[aliases][nothing]' => $random_name_2);
+    $this->drupalPost($row_options, $edit, t('Apply'));
+
     $this->drupalPost(NULL, array(), t('Save'));
 
     $view = views_get_view('test_serializer_display_field');
@@ -191,7 +197,7 @@ public function testUIFieldAlias() {
       foreach ($view->field as $id => $field) {
         // This will be the custom field.
         if ($field->field_alias == 'unknown') {
-          $expected_row[$random_string] = $field->render($row);
+          $expected_row[$random_name_2] = $field->render($row);
         }
         // This will be the name field.
         else {