diff --git a/environment_indicator.routing.yml b/environment_indicator.routing.yml
index 3763994f5c9e746e15b0bb3f71103836cc7276bd..ff295133961c988990799c8506068fe8f97658e5 100644
--- a/environment_indicator.routing.yml
+++ b/environment_indicator.routing.yml
@@ -2,7 +2,7 @@ entity.environment_indicator.collection:
   path: '/admin/config/development/environment-indicator/switcher'
   defaults:
     _entity_list: 'environment_indicator'
-    _title: 'Environment Indicator Switcher'
+    _title: 'Environment indicator switchers'
   requirements:
     _permission: 'administer environment indicator settings'
 
@@ -16,14 +16,16 @@ entity.environment_indicator.delete_form:
 entity.environment_indicator.edit_form:
   path: '/admin/config/development/environment-indicator/manage/{environment_indicator}'
   defaults:
-    _entity_form: environment_indicator.default
+    _entity_form: environment_indicator.edit
+    _title_callback: '\Drupal\environment_indicator\Controller\EnvironmentIndicatorSwitcher::editTitle'
   requirements:
     _entity_access: 'environment_indicator.update'
 
 entity.environment_indicator.add:
   path: '/admin/config/development/environment-indicator/switcher/add'
   defaults:
-    _entity_form: environment_indicator.default
+    _entity_form: environment_indicator.add
+    _title: 'Add environment indicator switcher'
   requirements:
     _entity_create_access: 'environment_indicator'
 
@@ -31,6 +33,6 @@ environment_indicator.settings:
   path: '/admin/config/development/environment-indicator'
   defaults:
     _form: '\Drupal\environment_indicator\Form\EnvironmentIndicatorSettingsForm'
-    _title: 'Environment Indicator Settings'
+    _title: 'Environment indicator settings'
   requirements:
     _permission: 'administer environment indicator settings'
diff --git a/src/Controller/EnvironmentIndicatorSwitcher.php b/src/Controller/EnvironmentIndicatorSwitcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..704e2ef00f77a068311d60e774c11beed68d9012
--- /dev/null
+++ b/src/Controller/EnvironmentIndicatorSwitcher.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\environment_indicator\Controller;
+
+use Drupal\environment_indicator\Entity\EnvironmentIndicator;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+
+/**
+ * Provides title callbacks for environment indicator switcher routes.
+ */
+class EnvironmentIndicatorSwitcher {
+  use StringTranslationTrait;
+
+  /**
+   * Returns the title for the environment indicator switcher list page.
+   */
+  public function editTitle(EnvironmentIndicator $environment_indicator): string {
+    return (string) $this->t('Edit environment indicator switcher: @label', ['@label' => $environment_indicator->label()]);
+  }
+
+}
diff --git a/src/Entity/EnvironmentIndicator.php b/src/Entity/EnvironmentIndicator.php
index 13fc23cbeb90d50cfd79aff4a7c1ced7786031ff..881e6cc04993d8bf14616057dd9bd732cd1cf487 100644
--- a/src/Entity/EnvironmentIndicator.php
+++ b/src/Entity/EnvironmentIndicator.php
@@ -17,7 +17,8 @@
  *     "access" = "Drupal\environment_indicator\EnvironmentIndicatorAccessControlHandler",
  *     "list_builder" = "Drupal\environment_indicator\EnvironmentIndicatorListBuilder",
  *     "form" = {
- *       "default" = "Drupal\environment_indicator\EnvironmentIndicatorForm",
+ *       "add" = "Drupal\environment_indicator\EnvironmentIndicatorForm",
+ *       "edit" = "Drupal\environment_indicator\EnvironmentIndicatorForm",
  *       "delete" = "Drupal\Core\Entity\EntityDeleteForm"
  *     }
  *   },