diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php
index 174c6e9..a33df45 100644
--- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php
+++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php
@@ -21,10 +21,10 @@ class DeviceFormController extends EntityFormController {
   public function form(array $form, array &$form_state, EntityInterface $responsive_preview_device = NULL) {
     switch ($form_state['controller']->getOperation()) {
       case 'add':
-        $form['_title'] = $this->t('Add device');
+        $form['#title'] = $this->t('Add device');
         break;
       case 'edit':
-        $form['_title'] = $this->t('Edit device');
+        $form['#title'] = $this->t('Edit device');
         break;
     }
     $entity = $this->entity;
diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php
index 41cce61..14a93a0 100644
--- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php
+++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php
@@ -25,8 +25,10 @@ public function getQuestion() {
   /**
    * {@inheritdoc}
    */
-  public function getCancelPath() {
-    return 'admin/config/content/responsive-preview';
+  public function getCancelRoute() {
+    return array(
+      'route_name' => 'responsive_preview.device.list',
+    );
   }
 
   /**
diff --git a/core/modules/responsive_preview/responsive_preview.local_actions.yml b/core/modules/responsive_preview/responsive_preview.local_actions.yml
index 42d368b..2a7a2f9 100644
--- a/core/modules/responsive_preview/responsive_preview.local_actions.yml
+++ b/core/modules/responsive_preview/responsive_preview.local_actions.yml
@@ -1,4 +1,4 @@
-responsive_preview.device.add_local_action
+responsive_preview.device.add_local_action:
   route_name: responsive_preview.device.add
   title: 'Add device'
   appears_on: