diff --git a/src/Entity/ModuleBuilderModule.php b/src/Entity/ModuleBuilderModule.php
index 4620ec1..21cf4df 100644
--- a/src/Entity/ModuleBuilderModule.php
+++ b/src/Entity/ModuleBuilderModule.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\Entity\ModuleBuilderModule.
- */
 
 namespace Drupal\module_builder\Entity;
 
diff --git a/src/ExceptionHandler.php b/src/ExceptionHandler.php
index 7c03fa7..4267472 100644
--- a/src/ExceptionHandler.php
+++ b/src/ExceptionHandler.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\module_builder\ExceptionHandler.
- */
-
 namespace Drupal\module_builder;
 
 use DrupalCodeBuilder\Exception\SanityException;
diff --git a/src/Form/ModuleBuilderComponentFormBase.php b/src/Form/ModuleBuilderComponentFormBase.php
index e220205..e24b811 100644
--- a/src/Form/ModuleBuilderComponentFormBase.php
+++ b/src/Form/ModuleBuilderComponentFormBase.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\Form\ModuleBuilderComponentFormBase.
- */
 
 namespace Drupal\module_builder\Form;
 
diff --git a/src/Form/ModuleBuilderComponentGenerateForm.php b/src/Form/ModuleBuilderComponentGenerateForm.php
index 86f2338..3ccfe1d 100644
--- a/src/Form/ModuleBuilderComponentGenerateForm.php
+++ b/src/Form/ModuleBuilderComponentGenerateForm.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\Form\ModuleBuilderComponentGenerateForm.
- */
 
 namespace Drupal\module_builder\Form;
 
diff --git a/src/Form/ModuleBuilderModuleHooksForm.php b/src/Form/ModuleBuilderModuleHooksForm.php
index 3d44e74..67e9e92 100644
--- a/src/Form/ModuleBuilderModuleHooksForm.php
+++ b/src/Form/ModuleBuilderModuleHooksForm.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\Form\ModuleBuilderModuleHooksForm.
- */
 
 namespace Drupal\module_builder\Form;
 
diff --git a/src/Form/ModuleBuilderModuleMiscForm.php b/src/Form/ModuleBuilderModuleMiscForm.php
index c8aab09..8b0b99a 100644
--- a/src/Form/ModuleBuilderModuleMiscForm.php
+++ b/src/Form/ModuleBuilderModuleMiscForm.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\Form\ModuleBuilderModuleMiscForm.
- */
 
 namespace Drupal\module_builder\Form;
 
diff --git a/src/Form/ModuleBuilderModuleNameForm.php b/src/Form/ModuleBuilderModuleNameForm.php
index a51edb8..6fc22cf 100644
--- a/src/Form/ModuleBuilderModuleNameForm.php
+++ b/src/Form/ModuleBuilderModuleNameForm.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\Form\ModuleBuilderModuleNameForm.
- */
 
 namespace Drupal\module_builder\Form;
 
diff --git a/src/Form/ModuleBuilderModulePluginsForm.php b/src/Form/ModuleBuilderModulePluginsForm.php
index 511a434..1f53420 100644
--- a/src/Form/ModuleBuilderModulePluginsForm.php
+++ b/src/Form/ModuleBuilderModulePluginsForm.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\Form\ModuleBuilderModulePluginsForm.
- */
 
 namespace Drupal\module_builder\Form;
 
diff --git a/src/Form/ProcessForm.php b/src/Form/ProcessForm.php
index c64ebd5..3e9a177 100644
--- a/src/Form/ProcessForm.php
+++ b/src/Form/ProcessForm.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\module_builder\Form\ProcessForm
- */
 namespace Drupal\module_builder\Form;
 
 use Drupal\Core\Form\FormBase;
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index b850879..ef88bd3 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\module_builder\Form\SettingsForm
- */
 namespace Drupal\module_builder\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
diff --git a/src/LibraryWrapper.php b/src/LibraryWrapper.php
index 1855065..6fe07c5 100644
--- a/src/LibraryWrapper.php
+++ b/src/LibraryWrapper.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\module_builder\LibraryWrapper.
- */
 
 namespace Drupal\module_builder;
 
diff --git a/src/ModuleBuilderComponentListBuilder.php b/src/ModuleBuilderComponentListBuilder.php
index c626a3a..fa9c591 100644
--- a/src/ModuleBuilderComponentListBuilder.php
+++ b/src/ModuleBuilderComponentListBuilder.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\module_builder\ModuleBuilderComponentListBuilder.
- */
-
 namespace Drupal\module_builder;
 
 use Drupal\Core\Entity\EntityInterface;
@@ -63,26 +58,26 @@ class ModuleBuilderComponentListBuilder extends ConfigEntityListBuilder {
 
     $operations['hooks'] = array(
       'title' => t('Edit hooks'),
-      'url' => $entity->urlInfo('hooks-form'),
+      'url' => $entity->toUrl('hooks-form'),
       'weight' => 5,
     );
 
     $operations['plugins'] = array(
       'title' => t('Edit plugins'),
-      'url' => $entity->urlInfo('plugins-form'),
+      'url' => $entity->toUrl('plugins-form'),
       'weight' => 10,
     );
 
     $operations['misc'] = array(
       'title' => t('Edit other components'),
-      'url' => $entity->urlInfo('misc-form'),
+      'url' => $entity->toUrl('misc-form'),
       'weight' => 15,
     );
 
     $operations['generate'] = array(
       'title' => t('Generate code'),
       'weight' => 20,
-      'url' => $entity->urlInfo('generate-form'),
+      'url' => $entity->toUrl('generate-form'),
     );
 
     return $operations;
diff --git a/tests/sample_hook_definitions/7/hooks_processed.php b/tests/sample_hook_definitions/7/hooks_processed.php
index 2e15c68..6698a58 100644
--- a/tests/sample_hook_definitions/7/hooks_processed.php
+++ b/tests/sample_hook_definitions/7/hooks_processed.php
@@ -1662,7 +1662,7 @@ a:2:{s:4:"node";a:32:{s:16:"hook_node_grants";a:9:{s:4:"type";s:4:"hook";s:4:"na
     // of a field (field_title).
     if (isset($context['tokens']['title'])) {
       $title = field_view_field('node', $node, 'field_title', 'default', $language_code);
-      $replacements[$context['tokens']['title']] = drupal_render($title);
+      $replacements[$context['tokens']['title']] = \Drupal::service('renderer')->render($title);
     }
   }
 ";}s:15:"hook_token_info";a:9:{s:4:"type";s:4:"hook";s:4:"name";s:15:"hook_token_info";s:10:"definition";s:26:"function hook_token_info()";s:11:"description";s:71:"Provide information about available placeholder tokens and token types.";s:11:"destination";s:18:"%module.tokens.inc";s:12:"dependencies";a:0:{}s:5:"group";s:6:"system";s:9:"file_path";s:48:"/Users/joachim/bin/drupal_hooks/7/system.api.php";s:4:"body";s:920:"
