diff --git a/src/Form/SimpleReservationItemDeleteForm.php b/src/Form/SimpleReservationItemDeleteForm.php
index 5ac8f23..1ecaf04 100644
--- a/src/Form/SimpleReservationItemDeleteForm.php
+++ b/src/Form/SimpleReservationItemDeleteForm.php
@@ -8,6 +8,7 @@
 namespace Drupal\simplereservation\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Url;
 
 /**
  * Provides form to delete reservation item.
@@ -28,7 +29,7 @@ class SimpleReservationItemDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Implements \Drupal\Core\Form\ConfirmFormBase::getQuestion().
+   * {@inheritdoc}
    */
   public function getQuestion() {
 
@@ -43,23 +44,21 @@ class SimpleReservationItemDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Implements \Drupal\Core\Form\ConfirmFormBase::getCancelRoute().
+   * {@inheritdoc}
    */
-  public function getCancelRoute() {
-    return array(
-      'route_name' => 'simplereservation.admin_config_services_items'
-    );
+  public function getCancelUrl() {
+    return new Url('simplereservation.admin_config_services_items');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getConfirmText().
+   * {@inheritdoc}
    */
   public function getConfirmText() {
     return t('Delete');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getCancelText().
+   * {@inheritdoc}
    */
   public function getCancelText() {
     return t('Cancel');
@@ -84,9 +83,10 @@ class SimpleReservationItemDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Handles the deletion of a item.
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
+    // Handles the deletion of a item.
     db_delete('simplereservation_item')
         ->condition('iid', $form_state['values']['iid'])
         ->execute();
diff --git a/src/Form/SimpleReservationNodeTypeChangeForm.php b/src/Form/SimpleReservationNodeTypeChangeForm.php
index 6605cdf..22449dd 100644
--- a/src/Form/SimpleReservationNodeTypeChangeForm.php
+++ b/src/Form/SimpleReservationNodeTypeChangeForm.php
@@ -8,6 +8,7 @@
 namespace Drupal\simplereservation\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Url;
 
 /**
  * Provides form to delete reservation item.
@@ -56,23 +57,21 @@ class SimpleReservationNodeTypeChangeForm extends ConfirmFormBase {
   }
 
   /**
-   * Implements \Drupal\Core\Form\ConfirmFormBase::getCancelRoute().
+   * {@inheritdoc}
    */
-  public function getCancelRoute() {
-    return array(
-      'route_name' => 'simplereservation.admin_config_services_items'
-    );
+  public function getCancelUrl() {
+    return new Url('simplereservation.admin_config_services_items');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getConfirmText().
+   * {@inheritdoc}
    */
   public function getConfirmText() {
     return t('Proceed');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getCancelText().
+   * {@inheritdoc}
    */
   public function getCancelText() {
     return t('Cancel');
@@ -117,9 +116,10 @@ class SimpleReservationNodeTypeChangeForm extends ConfirmFormBase {
   }
 
   /**
-   * Handle the status change of a node.
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
+  // Handle the status change of a node.
   echo $form_state['values']['node_nid'];
 
   if ($form_state['values']['node_change'] == 'enable') {
diff --git a/src/Form/SimpleReservationNodeTypeDeleteForm.php b/src/Form/SimpleReservationNodeTypeDeleteForm.php
index 5e07799..0e8cde7 100644
--- a/src/Form/SimpleReservationNodeTypeDeleteForm.php
+++ b/src/Form/SimpleReservationNodeTypeDeleteForm.php
@@ -8,6 +8,7 @@
 namespace Drupal\simplereservation\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Url;
 
 /**
  * Provides form to delete reservation item.
@@ -28,13 +29,13 @@ class SimpleReservationNodeTypeDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Implements \Drupal\Core\Form\ConfirmFormBase::getQuestion().
+   * {@inheritdoc}
    */
   public function getQuestion() {
 
     // Load node uuid / type conversion list.
     foreach(node_type_get_types() as $bundle) {
-      $node_type_list[$bundle->uuid] = $bundle->type;
+      $node_type_list[$bundle->uuid()] = $bundle->type;
     }
     if (!@$node_type_list[$this->nodeType]) $node_type = "--deleted--";
       else $node_type = $node_type_list[$this->nodeType];
@@ -50,23 +51,21 @@ class SimpleReservationNodeTypeDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Implements \Drupal\Core\Form\ConfirmFormBase::getCancelRoute().
+   * {@inheritdoc}
    */
-  public function getCancelRoute() {
-    return array(
-      'route_name' => 'simplereservation.admin_config_services_items'
-    );
+  public function getCancelUrl() {
+    return new Url('simplereservation.admin_config_services_node_type');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getConfirmText().
+   * {@inheritdoc}
    */
   public function getConfirmText() {
     return t('Delete');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getCancelText().
+   * {@inheritdoc}
    */
   public function getCancelText() {
     return t('Cancel');
@@ -91,9 +90,10 @@ class SimpleReservationNodeTypeDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Handle the deletion of a item.
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
+    //  Handle the deletion of a item.
     db_delete('simplereservation_node')
         ->condition('iid', $form_state['values']['iid'])
         ->execute();
diff --git a/src/Form/SimpleReservationReservationDeleteForm.php b/src/Form/SimpleReservationReservationDeleteForm.php
index 3d6e9ca..fbaad27 100644
--- a/src/Form/SimpleReservationReservationDeleteForm.php
+++ b/src/Form/SimpleReservationReservationDeleteForm.php
@@ -8,6 +8,7 @@
 namespace Drupal\simplereservation\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Url;
 
 /**
  * Provides form to delete reservation item.
@@ -41,25 +42,21 @@ class SimpleReservationReservationDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Implements \Drupal\Core\Form\ConfirmFormBase::getCancelRoute().
-   * 
-   * @todo must make reroute like drupal7 version.
+   * {@inheritdoc}
    */
-  public function getCancelRoute() {
-    return array(
-      'route_name' => 'simplereservation.simplereservation'
-    );
+  public function getCancelUrl() {
+    return new Url('simplereservation.admin_config_services_items');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getConfirmText().
+   * {@inheritdoc}
    */
   public function getConfirmText() {
     return t('Delete');
   }
 
   /**
-   * Overrides \Drupal\Core\Form\ConfirmFormBase::getCancelText().
+   * {@inheritdoc}
    */
   public function getCancelText() {
     return t('Cancel');
@@ -68,7 +65,6 @@ class SimpleReservationReservationDeleteForm extends ConfirmFormBase {
   /**
    * {@inheritdoc}
    */
-  
   public function buildForm(array $form, array &$form_state, $reservation_number = NULL) {
 
     // Save rid for use in confirm message.
@@ -87,23 +83,22 @@ class SimpleReservationReservationDeleteForm extends ConfirmFormBase {
   }
 
   /**
-   * Handle the deletion of a item.
+   * {@inheritdoc}
    */
-  //function simplereservation_item_delete_confirm_submit($form, &$form_state) {
   public function submitForm(array &$form, array &$form_state) {
-    
-  $sql = "DELETE FROM {simplereservation_reservation} WHERE rid=%d";
-  db_delete('simplereservation_reservation')
-  ->condition('rid', $form_state['values']['rid'])
-  ->execute();
+    //Handle the deletion of a item.
+    $sql = "DELETE FROM {simplereservation_reservation} WHERE rid=%d";
+    db_delete('simplereservation_reservation')
+      ->condition('rid', $form_state['values']['rid'])
+      ->execute();
 
-  drupal_set_message(t('The reservation has been deleted.'));
+    drupal_set_message(t('The reservation has been deleted.'));
 
-  // Trigger our trigger.
-  simplereservation_invoke_hook('simplereservation', 'delete_reservation');
+    // Trigger our trigger.
+    simplereservation_invoke_hook('simplereservation', 'delete_reservation');
 
-  // Go back to the administration of system-wide weather blocks.
-  $form_state['redirect'] = 'simplereservation';
+    // Go back to the administration of system-wide weather blocks.
+    $form_state['redirect'] = 'simplereservation';
   }
 
 }