cdn.module       |  6 +++---
 cdn.routing.yml  |  2 +-
 cdn.services.yml | 20 +++++++-------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/cdn.module b/cdn.module
index c0339e2..cad6811 100644
--- a/cdn.module
+++ b/cdn.module
@@ -47,7 +47,7 @@ function cdn_file_url_alter(&$uri) {
 
   // Don't serve CKEditor from a CDN when far future future is enabled (CKEditor
   // insists on computing other assets to load based on this URL).
-  if ($uri === 'core/assets/vendor/ckeditor/ckeditor.js' && \Drupal::service('cdn.settings')->farfutureIsEnabled()) {
+  if ($uri === 'core/assets/vendor/ckeditor/ckeditor.js' && \Drupal::service('Drupal\cdn\CdnSettings')->farfutureIsEnabled()) {
     return;
   }
 
@@ -58,7 +58,7 @@ function cdn_file_url_alter(&$uri) {
     return;
   }
 
-  $result = \Drupal::service('cdn.file_url_generator')->generate($uri);
+  $result = \Drupal::service('Drupal\cdn\File\FileUrlGenerator')->generate($uri);
   if ($result) {
     $uri = $result;
   }
@@ -74,7 +74,7 @@ function cdn_editor_js_settings_alter(array &$settings) {
 
   // Don't serve CKEditor plugins from a CDN when far future future is enabled
   // (CKEditor insists on computing other assets to load based on these URLs).
-  if (!\Drupal::service('cdn.settings')->farfutureIsEnabled()) {
+  if (!\Drupal::service('Drupal\cdn\CdnSettings')->farfutureIsEnabled()) {
     return;
   }
 
diff --git a/cdn.routing.yml b/cdn.routing.yml
index 45e7d2e..0916edf 100644
--- a/cdn.routing.yml
+++ b/cdn.routing.yml
@@ -1,7 +1,7 @@
 cdn.farfuture.download:
   path: '/cdn/ff/{security_token}/{mtime}/{scheme}'
   defaults:
-    _controller: cdn.controller.farfuture:download
+    _controller: Drupal\cdn\CdnFarfutureController:download
     # Ensure the redirect module does not redirect to add a language prefix.
     # @see \Drupal\redirect\EventSubscriber\RouteNormalizerRequestSubscriber
     # @todo Update this comment when https://www.drupal.org/project/drupal/issues/2641118 lands.
diff --git a/cdn.services.yml b/cdn.services.yml
index 1ad387b..5c4e73b 100644
--- a/cdn.services.yml
+++ b/cdn.services.yml
@@ -2,25 +2,21 @@ services:
   Drupal\cdn\CdnSettings:
     arguments: ['@config.factory']
 
-  cdn.file_url_generator:
-    class: Drupal\cdn\File\FileUrlGenerator
+  Drupal\cdn\File\FileUrlGenerator:
     arguments: ['%app.root%', '@stream_wrapper_manager', '@request_stack', '@private_key', '@Drupal\cdn\CdnSettings']
 
   # Event subscribers.
-  cdn.config_subscriber:
-    class: Drupal\cdn\EventSubscriber\ConfigSubscriber
+  Drupal\cdn\EventSubscriber\ConfigSubscriber:
     arguments: ['@cache_tags.invalidator', '@config.typed', '@kernel', '@config.installer']
     tags:
       - { name: event_subscriber }
-  cdn.html_response_subscriber:
-    class: Drupal\cdn\EventSubscriber\HtmlResponseSubscriber
+  Drupal\cdn\EventSubscriber\HtmlResponseSubscriber:
     autowire: true
     tags:
       - { name: event_subscriber }
 
   # Controllers.
-  cdn.controller.farfuture:
-    class: \Drupal\cdn\CdnFarfutureController
+  Drupal\cdn\CdnFarfutureController:
     arguments: ['@private_key', '@stream_wrapper_manager']
 
   # Inbound path processor for the cdn.farfuture.download route, since the
@@ -29,14 +25,12 @@ services:
   # - http://symfony.com/doc/2.8/routing/slash_in_parameter.html
   # - http://drupal.stackexchange.com/questions/175758/slashes-in-single-route-parameter-or-other-ways-to-handle-a-menu-tail-with-dynam
   # - https://api.drupal.org/api/drupal/includes%21menu.inc/function/menu_tail_to_arg/7.x
-  path_processor.cdn:
-    class: Drupal\cdn\PathProcessor\CdnFarfuturePathProcessor
+  Drupal\cdn\PathProcessor\CdnFarfuturePathProcessor:
     tags:
       - { name: path_processor_inbound }
 
   # Decorators.
-  cdn.asset.css.optimizer:
+  Drupal\cdn\Asset\CssOptimizer:
     public: false
-    class: Drupal\cdn\Asset\CssOptimizer
     decorates: asset.css.optimizer
-    arguments: ['@cdn.asset.css.optimizer.inner']
+    arguments: ['@Drupal\cdn\Asset\CssOptimizer.inner']