diff --git a/drd_agent.routing.yml b/drd_agent.routing.yml
index 456cad1ec363960318a9c777c8665c2a4c08790f..6bc1ecd6f1f78b1d451d832b35c7ae67e3cab246 100644
--- a/drd_agent.routing.yml
+++ b/drd_agent.routing.yml
@@ -2,7 +2,7 @@
 drd_agent.settings.form:
   path: '/admin/config/system/drd'
   defaults:
-    _form: '\Drupal\drd_agent\Form\DrdAgentSettingsForm'
+    _form: '\Drupal\drd_agent\Form\Settings'
     _title: 'DRD Agent'
   requirements:
     _permission: 'administer site configuration'
@@ -12,18 +12,18 @@ drd_agent.settings.form:
 drd_agent.default:
   path: '/drd-agent'
   defaults:
-    _controller: '\Drupal\drd_agent\Controller\DefaultController::get'
+    _controller: '\Drupal\drd_agent\Controller\Agent::get'
   requirements:
     _access: 'TRUE'
 drd_agent.crypt:
   path: '/drd-agent-crypt'
   defaults:
-    _controller: '\Drupal\drd_agent\Controller\DefaultController::getCryptMethods'
+    _controller: '\Drupal\drd_agent\Controller\Agent::getCryptMethods'
   requirements:
     _access: 'TRUE'
 drd_agent.setup:
   path: '/drd-agent-setup/{values}'
   defaults:
-    _controller: '\Drupal\drd_agent\Controller\DefaultController::setup'
+    _controller: '\Drupal\drd_agent\Controller\Agent::setup'
   requirements:
     _permission: 'administer site configuration'
diff --git a/src/Controller/DefaultController.php b/src/Controller/Agent.php
similarity index 97%
rename from src/Controller/DefaultController.php
rename to src/Controller/Agent.php
index b19986622049e2e379fda4897e4f019ab899c947..ec2f3c8d34b49bbfc94ed77cddb8fbfb09602718 100644
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/Agent.php
@@ -9,11 +9,11 @@ use GuzzleHttp\Client;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class DefaultController.
+ * Class Default.
  *
  * @package Drupal\drd_agent\Controller
  */
-class DefaultController extends ControllerBase {
+class Agent extends ControllerBase {
 
   /**
    * @var ImmutableConfig
diff --git a/src/Form/DrdAgentSettingsForm.php b/src/Form/Settings.php
similarity index 91%
rename from src/Form/DrdAgentSettingsForm.php
rename to src/Form/Settings.php
index d472235572a97c1ddf524d7d4aac32cb674f4173..e5a6d20037b3e9e7cc1996b15b2271be488beb6b 100644
--- a/src/Form/DrdAgentSettingsForm.php
+++ b/src/Form/Settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\drd_agent\Form\DrdAgentSettingsForm.
+ * Contains \Drupal\drd_agent\Form\Settings.
  */
 
 namespace Drupal\drd_agent\Form;
@@ -13,7 +13,7 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Configure drd-agent settings for this site.
  */
-class DrdAgentSettingsForm extends ConfigFormBase {
+class Settings extends ConfigFormBase {
 
   /**
    * {@inheritdoc}