diff --git a/entity_browser.routing.yml b/entity_browser.routing.yml
index 412ed6e..d06712a 100644
--- a/entity_browser.routing.yml
+++ b/entity_browser.routing.yml
@@ -22,11 +22,12 @@ entity.entity_browser.add_form:
     _permission: 'administer entity browsers'
 
 entity.entity_browser.edit_form:
-  path: '/admin/config/content/entity_browser/{machine_name}/{step}'
+  path: '/admin/config/content/entity_browser/{entity_browser}/{step}'
   defaults:
     _entity_wizard: 'entity_browser.edit'
     _title: 'Edit Entity browser'
     tempstore_id: 'entity_browser.config'
+    step: 'general'
   requirements:
     _permission: 'administer entity browsers'
 
diff --git a/src/Entity/EntityBrowser.php b/src/Entity/EntityBrowser.php
index c8508d7..3e542d3 100644
--- a/src/Entity/EntityBrowser.php
+++ b/src/Entity/EntityBrowser.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Entity\EntityBrowser.
- */
-
 namespace Drupal\entity_browser\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
@@ -463,12 +458,8 @@ class EntityBrowser extends ConfigEntityBase implements EntityBrowserInterface,
   protected function urlRouteParameters($rel) {
     $uri_route_parameters = parent::urlRouteParameters($rel);
 
-    // Form wizard expects step argument and uses machine_name instead of
-    // entity_browser.
-    if ($rel == 'edit-form') {
+    if ($rel == 'config-translation-overview') {
       $uri_route_parameters['step'] = 'general';
-      $uri_route_parameters['machine_name'] = $uri_route_parameters['entity_browser'];
-      unset($uri_route_parameters['entity_browser']);
     }
 
     return $uri_route_parameters;
diff --git a/src/Form/DisplayConfig.php b/src/Form/DisplayConfig.php
index 2804718..14be01d 100644
--- a/src/Form/DisplayConfig.php
+++ b/src/Form/DisplayConfig.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Form\DisplayConfig.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\entity_browser\EntityBrowserInterface;
diff --git a/src/Form/EntityBrowserDeleteForm.php b/src/Form/EntityBrowserDeleteForm.php
index 24de209..ac531c3 100644
--- a/src/Form/EntityBrowserDeleteForm.php
+++ b/src/Form/EntityBrowserDeleteForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\entity_browser\Form\EntityBrowserDeleteForm.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\Core\Entity\EntityDeleteForm;
diff --git a/src/Form/EntityBrowserForm.php b/src/Form/EntityBrowserForm.php
index f145827..71b7294 100644
--- a/src/Form/EntityBrowserForm.php
+++ b/src/Form/EntityBrowserForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Form\EntityBrowserForm.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\Core\Form\FormBase;
diff --git a/src/Form/GeneralInfoConfig.php b/src/Form/GeneralInfoConfig.php
index 9369c58..eedeb03 100644
--- a/src/Form/GeneralInfoConfig.php
+++ b/src/Form/GeneralInfoConfig.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Form\GeneralInfoConfig.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\Core\Form\FormBase;
diff --git a/src/Form/PluginConfigFormBase.php b/src/Form/PluginConfigFormBase.php
index 1a09667..e85ab96 100644
--- a/src/Form/PluginConfigFormBase.php
+++ b/src/Form/PluginConfigFormBase.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Form\PluginConfigFormBase.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\Core\Form\FormBase;
diff --git a/src/Form/SelectionDisplayConfig.php b/src/Form/SelectionDisplayConfig.php
index da1195a..fd1278d 100644
--- a/src/Form/SelectionDisplayConfig.php
+++ b/src/Form/SelectionDisplayConfig.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Form\SelectionDisplayConfig.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\entity_browser\EntityBrowserInterface;
diff --git a/src/Form/WidgetSelectorConfig.php b/src/Form/WidgetSelectorConfig.php
index 275e420..2625ed0 100644
--- a/src/Form/WidgetSelectorConfig.php
+++ b/src/Form/WidgetSelectorConfig.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Form\WidgetSelectorConfig.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\entity_browser\EntityBrowserInterface;
diff --git a/src/Form/WidgetsConfig.php b/src/Form/WidgetsConfig.php
index adf4c94..77f51ee 100644
--- a/src/Form/WidgetsConfig.php
+++ b/src/Form/WidgetsConfig.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_browser\Form\WidgetsConfig.
- */
-
 namespace Drupal\entity_browser\Form;
 
 use Drupal\Core\Form\FormBase;
diff --git a/src/Wizard/EntityBrowserWizard.php b/src/Wizard/EntityBrowserWizard.php
index e70d964..91b4085 100644
--- a/src/Wizard/EntityBrowserWizard.php
+++ b/src/Wizard/EntityBrowserWizard.php
@@ -1,18 +1,19 @@
 <?php
-/**
- * @file
- * Contains \Drupal\entity_browser\Wizard\EntityBrowserWizard.
- */
+
 namespace Drupal\entity_browser\Wizard;
 
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
+use Drupal\Core\DependencyInjection\ClassResolverInterface;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Form\FormBuilderInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\ctools\Wizard\EntityFormWizardBase;
 use Drupal\entity_browser\Form\DisplayConfig;
 use Drupal\entity_browser\Form\GeneralInfoConfig;
 use Drupal\entity_browser\Form\SelectionDisplayConfig;
 use Drupal\entity_browser\Form\WidgetsConfig;
 use Drupal\entity_browser\Form\WidgetSelectorConfig;
+use Drupal\user\SharedTempStoreFactory;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Custom form wizard for entity browser configuration.
@@ -20,6 +21,39 @@ use Drupal\entity_browser\Form\WidgetSelectorConfig;
 class EntityBrowserWizard extends EntityFormWizardBase {
 
   /**
+   * @param \Drupal\user\SharedTempStoreFactory $tempstore
+   *   Tempstore Factory for keeping track of values in each step of the
+   *   wizard.
+   * @param \Drupal\Core\Form\FormBuilderInterface $builder
+   *   The Form Builder.
+   * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
+   *   The class resolver.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   *   The event dispatcher.
+   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   *   The entity manager.
+   * @param $tempstore_id
+   *   The shared temp store factory collection name.
+   * @param null $machine_name
+   *   The SharedTempStore key for our current wizard values.
+   * @param null $step
+   *   The current active step of the wizard.
+   */
+  public function __construct(SharedTempStoreFactory $tempstore, FormBuilderInterface $builder, ClassResolverInterface $class_resolver, EventDispatcherInterface $event_dispatcher, EntityManagerInterface $entity_manager, RouteMatchInterface $route_match, $tempstore_id, $entity_browser = NULL, $step = 'general') {
+    parent::__construct($tempstore, $builder, $class_resolver, $event_dispatcher, $entity_manager, $route_match, $tempstore_id, $entity_browser, $step);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getNextParameters($cached_values) {
+    $parameters = parent::getNextParameters($cached_values);
+    $parameters['entity_browser'] = $parameters['machine_name'];
+    unset($parameters['machine_name']);
+    return $parameters;
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function getWizardLabel() {
diff --git a/src/Wizard/EntityBrowserWizardAdd.php b/src/Wizard/EntityBrowserWizardAdd.php
index 9845a3c..15a9f92 100644
--- a/src/Wizard/EntityBrowserWizardAdd.php
+++ b/src/Wizard/EntityBrowserWizardAdd.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\entity_browser\Wizard\EntityBrowserWizardAdd.
- */
 
 namespace Drupal\entity_browser\Wizard;